commit 927d29a8afa26a3f1aec841f2150c65e3931ef9b
author Xin Li <delphij@google.com> Wed Jul 14 21:08:45 2021 +0000
committer Xin Li <delphij@google.com> Wed Jul 14 22:51:33 2021 +0000
tree 5f614d8c6c55ab76d7484cf6463f82c3f804dc9c
parent 8db30d686a5298a28c6275cc05fb24fb1cfa1ba5

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 <rtenneti@google.com>
Tested-by: Xin Li <delphij@google.com>

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index e6dbf1c..a770c25 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -959,9 +959,7 @@
 
     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,