diff options
| author | Xin Li <delphij@google.com> | 2021-07-14 21:08:45 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-07-14 22:51:33 +0000 |
| commit | 927d29a8afa26a3f1aec841f2150c65e3931ef9b (patch) | |
| tree | 5f614d8c6c55ab76d7484cf6463f82c3f804dc9c | |
| parent | 8db30d686a5298a28c6275cc05fb24fb1cfa1ba5 (diff) | |
| download | git-repo-927d29a8afa26a3f1aec841f2150c65e3931ef9b.tar.gz | |
Update manifest_name with the returned manifest name for superproject.v2.16.2
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>
| -rw-r--r-- | subcmds/sync.py | 4 |
1 files changed, 1 insertions, 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. | |||
| 959 | 959 | ||
| 960 | load_local_manifests = not self.manifest.HasLocalManifests | 960 | load_local_manifests = not self.manifest.HasLocalManifests |
| 961 | if git_superproject.UseSuperproject(opt, self.manifest): | 961 | if git_superproject.UseSuperproject(opt, self.manifest): |
| 962 | new_manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests) | 962 | manifest_name = self._UpdateProjectsRevisionId(opt, args, load_local_manifests) or opt.manifest_name |
| 963 | if not new_manifest_name: | ||
| 964 | manifest_name = opt.manifest_name | ||
| 965 | 963 | ||
| 966 | if self.gitc_manifest: | 964 | if self.gitc_manifest: |
| 967 | gitc_manifest_projects = self.GetProjects(args, | 965 | gitc_manifest_projects = self.GetProjects(args, |