summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-07-13 18:21:49 +0000
committerXin Li <delphij@google.com>2021-07-13 23:35:07 +0000
commite39d8b36f6bee37424712a9b6ba7765183175c5e (patch)
treee181c0f242ab4ef2244b3da2183a3a1797a37686
parent06da9987f6be6ddc1637e8ae02646d6dfab09862 (diff)
downloadgit-repo-e39d8b36f6bee37424712a9b6ba7765183175c5e.tar.gz
Fix an issue that repo can't see projects declared in a local manifest.
When loading of superproject failed, we were resetting the manifest to None, and later code would reload the manifest to see if there are submodules, which would load the non-local manifest, causing sync with superproject to fail. Address this by setting the manifest_name to opt.manifest_name instead. Bug: [google internal] b/189139268 Change-Id: I3616512e1c4b73e7eca0d83fd1fc474b825adbbf Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/311102 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Xin Li <delphij@google.com>
-rw-r--r--subcmds/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 82eb569c..bd5ffd0c 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -960,7 +960,7 @@ later is required to fix a server side protocol bug.
960 if git_superproject.UseSuperproject(opt, self.manifest): 960 if git_superproject.UseSuperproject(opt, self.manifest):
961 new_manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests) 961 new_manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests)
962 if not new_manifest_name: 962 if not new_manifest_name:
963 manifest_name = new_manifest_name 963 manifest_name = opt.manifest_name
964 964
965 if self.gitc_manifest: 965 if self.gitc_manifest:
966 gitc_manifest_projects = self.GetProjects(args, 966 gitc_manifest_projects = self.GetProjects(args,