Joanna Wang 7fa149b47a 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>

2023-02-28 14:21:17 +00:00

..

__init__.py

strip python2-only coding:utf-8 & print_function settings

2021-01-06 18:53:05 +00:00

abandon.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

branches.py

subcmds: display correct path multitree messages

2022-11-15 21:13:06 +00:00

checkout.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

cherry_pick.py

cherry-pick: tighten up output

2022-08-22 19:38:32 +00:00

diff.py

status, diff: display correct path for multi-manifest

2022-07-14 16:00:18 +00:00

diffmanifests.py

subcmds: display correct path multitree messages

2022-11-15 21:13:06 +00:00

download.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

forall.py

forall: fix multi-manifest variables.

2022-04-14 14:31:47 +00:00

gitc_delete.py

commands: document the "common" class attribute

2021-06-15 06:07:37 +00:00

gitc_init.py

GitcInit: fix gitc-init failure

2022-11-04 17:30:40 +00:00

grep.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

help.py

help: fix grammar in help text

2021-11-12 17:30:32 +00:00

info.py

manifest: add submanifest.default_groups attribute

2022-04-29 18:42:23 +00:00

init.py

init: Silence the "rm -r .repo and try again" message if quiet

2023-01-06 16:01:52 +00:00

list.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

manifest.py

pylint: remove unused imports

2022-12-13 16:23:19 +00:00

overview.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

prune.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

rebase.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

selfupdate.py

sync: use namedtuples for internal return values

2022-09-19 22:03:18 +00:00

smartsync.py

commands: document the "common" class attribute

2021-06-15 06:07:37 +00:00

stage.py

stage: add missing flush before project prompt

2022-08-22 20:48:29 +00:00

start.py

Add multi-manifest support with <submanifest> element

2022-02-17 21:57:55 +00:00

status.py

status, diff: display correct path for multi-manifest

2022-07-14 16:00:18 +00:00

sync.py

sync: Remove unused variable

2023-02-02 18:11:27 +00:00

upload.py

upload: Skip upload if merge branch doesn't match project revision and

2023-02-28 14:21:17 +00:00

version.py

project: simplify GetRemote a bit

2022-08-17 16:54:21 +00:00