From 50c91ecf4f313a223bc6737d047fc32d665db0fd Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Tue, 8 Jun 2021 10:46:51 -0700 Subject: superproject: revert not updating commit ids if remote is different. 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 Reviewed-by: Jonathan Nieder Reviewed-by: Mike Frysinger --- git_superproject.py | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'git_superproject.py') diff --git a/git_superproject.py b/git_superproject.py index f7ccd574..dad6a3de 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -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) -- cgit v1.2.3-54-g00ecf