diff options
| author | Joanna Wang <jojwang@google.com> | 2023-02-24 18:21:34 -0500 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-28 14:21:17 +0000 |
| commit | 7fa149b47a980779f02ccaf1d1dbd5af5ce9abc7 (patch) | |
| tree | b8c435f51746c7b295cc1a6e6481d524cb14c6f6 /gitc_utils.py | |
| parent | a56e0e17e23f925ff44c75e5b89330ccc2598640 (diff) | |
| download | git-repo-7fa149b47a980779f02ccaf1d1dbd5af5ce9abc7.tar.gz | |
upload: Skip upload if merge branch doesn't match project revision andv2.32
dest_branch.
- This still prevents the case mentioned here:
https://gerrit-review.googlesource.com/c/50300
while also supporting dest_branch.
- Update _GetMergeBranch to get merge branches for any branch, not just
the one we happen to run `repo upload` in. (e.g. for uploading multiple
branches)
Bug: b/27955930
Change-Id: Ia8ee1d6a83a783c984bb2eb308bb11b3a721a95d
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/360794
Commit-Queue: Joanna Wang <jojwang@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Joanna Wang <jojwang@google.com>
Diffstat (limited to 'gitc_utils.py')
0 files changed, 0 insertions, 0 deletions