Fix initial sync broken by sync-c option

Change-Id: I308753da8944e6ce5c46e3bfee1bcd41d5b7e292
This commit is contained in:
Shawn O. Pearce 2012-05-24 09:46:50 -07:00
parent 23acdd3f14
commit 6ba6ba0ef3

View File

@ -966,7 +966,15 @@ class Project(object):
and self._ApplyCloneBundle(initial=is_new, quiet=quiet): and self._ApplyCloneBundle(initial=is_new, quiet=quiet):
is_new = False is_new = False
current_branch_only = current_branch_only or self.sync_c or self.manifest.default.sync_c if not current_branch_only:
if self.sync_c:
current_branch_only = True
elif not self.manifest._loaded:
# Manifest cannot check defaults until it syncs.
current_branch_only = False
elif self.manifest.default.sync_c:
current_branch_only = True
if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
current_branch_only=current_branch_only): current_branch_only=current_branch_only):
return False return False