From 927d29a8afa26a3f1aec841f2150c65e3931ef9b Mon Sep 17 00:00:00 2001 From: Xin Li Date: Wed, 14 Jul 2021 21:08:45 +0000 Subject: [PATCH] Update manifest_name with the returned manifest name for superproject. This is similar to smart sync, allowing sync to benefit from the patched manifest. Bug: [google internal] b/190688390 Change-Id: I158a80afceca606dcd81ec76b2caede369f7ed03 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/312142 Reviewed-by: Raman Tenneti Tested-by: Xin Li --- subcmds/sync.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index e6dbf1c8..a770c253 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -959,9 +959,7 @@ later is required to fix a server side protocol bug. load_local_manifests = not self.manifest.HasLocalManifests if git_superproject.UseSuperproject(opt, self.manifest): - new_manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests) - if not new_manifest_name: - manifest_name = opt.manifest_name + manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests) or opt.manifest_name if self.gitc_manifest: gitc_manifest_projects = self.GetProjects(args,