tree b8c435f51746c7b295cc1a6e6481d524cb14c6f6
parent a56e0e17e23f925ff44c75e5b89330ccc2598640
author Joanna Wang <jojwang@google.com> 1677280894 -0500
committer LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> 1677594077 +0000

upload: Skip upload if merge branch doesn't match project revision and
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>