Merge "Only fetch current branch on shallow clients"
diff --git a/project.py b/project.py
index 46f3b8f..a1249a8 100644
--- a/project.py
+++ b/project.py
@@ -1661,6 +1661,13 @@
# There is no such persistent revision. We have to fetch it.
return False
+ if self.clone_depth:
+ depth = self.clone_depth
+ else:
+ depth = self.manifest.manifestProject.config.GetString('repo.depth')
+ if depth:
+ current_branch_only = True
+
if current_branch_only:
if ID_RE.match(self.revisionExpr) is not None:
is_sha1 = True
@@ -1724,10 +1731,6 @@
# The --depth option only affects the initial fetch; after that we'll do
# full fetches of changes.
- if self.clone_depth:
- depth = self.clone_depth
- else:
- depth = self.manifest.manifestProject.config.GetString('repo.depth')
if depth and initial:
cmd.append('--depth=%s' % depth)