commit 6ba6ba0ef3ae4de384d931a50ec25e675e3aab16
author Shawn O. Pearce <sop@google.com> Thu May 24 09:46:50 2012 -0700
committer Shawn O. Pearce <sop@google.com> Thu May 24 09:46:50 2012 -0700
tree a570790f94d09ba475bc5f1b4a74462b6e409259
parent 23acdd3f1460bc1c040b319940c5e0e8a78f1040

Fix initial sync broken by sync-c option

Change-Id: I308753da8944e6ce5c46e3bfee1bcd41d5b7e292

project.py

diff --git a/project.py b/project.py
index 65fefd9..afab1b7 100644
--- a/project.py
+++ b/project.py
@@ -966,7 +966,15 @@
     and self._ApplyCloneBundle(initial=is_new, quiet=quiet):
       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,
                              current_branch_only=current_branch_only):
       return False