Tools/git-repo
1
0
Fork 0
Code Activity

superproject: revert not updating commit ids if remote is different.

Browse source 
superproject supports multiple remotes. Get all commit ids
from superproject for all projects that are in the manifest.

$ ./run_tests -v

Bug: [google internal] b/186395810
Change-Id: I6edce3918853a7a3a65aec5528e6a43a544eff53
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/308862
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Jonathan Nieder <jrn@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Raman Tenneti 2021-06-08 10:46:51 -07:00
parent 816d82c010
commit 50c91ecf4f
2 changed files with 0 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
git_superproject.py
View file

@ -264,20 +264,10 @@ class Superproject(object):
return None
projects_missing_commit_ids = []
superproject_fetchUrl = self._manifest.superproject['remote'].fetchUrl
for project in projects:
path = project.relpath
if not path:
continue
# Some manifests that pull projects from the "chromium" GoB
# (remote="chromium"), and have a private manifest that pulls projects
# from both the chromium GoB and "chrome-internal" GoB (remote="chrome").
# For such projects, one of the remotes will be different from
# superproject's remote. Until superproject, supports multiple remotes,
# don't update the commit ids of remotes that don't match superproject's
# remote.
if project.remote.fetchUrl != superproject_fetchUrl:
continue
commit_id = commit_ids.get(path)
if commit_id:
project.SetRevisionId(commit_id)