android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: Fix a corner case when both superproject and depth used.

Browse Source 
When depth is used, we would fetch only SHA1 when superproject is
used, as the result, only the manifest branch is being recorded,
and commands like repo start would fail.

Fix this by saving the upstream branch value in the overlay
manifest and add the upstream branch to fetch list.

Bug: [google internal] b/185951360
Change-Id: Ib36f56067723f2572ed817785b31cc928ddfec0a
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/304562
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Jonathan Nieder <jrn@google.com>
Tested-by: Xin Li <delphij@google.com>
This commit is contained in:
Xin Li 2021-04-29 01:50:38 -07:00 committed by Jonathan Nieder
parent a1cd770d56
commit aabf79d3f0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project.py
View File

@ -1214,6 +1214,9 @@ class Project(object):
(self.revisionExpr, self.name)) (self.revisionExpr, self.name))
def SetRevisionId(self, revisionId): def SetRevisionId(self, revisionId):
if self.clone_depth or self.manifest.manifestProject.config.GetString('repo.depth'):
self.upstream = self.revisionExpr
self.revisionId = revisionId self.revisionId = revisionId
def Sync_LocalHalf(self, syncbuf, force_sync=False, submodules=False): def Sync_LocalHalf(self, syncbuf, force_sync=False, submodules=False):
@ -2134,6 +2137,8 @@ class Project(object):
# Shallow checkout of a specific commit, fetch from that commit and not # Shallow checkout of a specific commit, fetch from that commit and not
# the heads only as the commit might be deeper in the history. # the heads only as the commit might be deeper in the history.
spec.append(branch) spec.append(branch)
if self.upstream:
spec.append(self.upstream)
else: else:
if is_sha1: if is_sha1:
branch = self.upstream branch = self.upstream