diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-18 18:36:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-18 18:36:34 +0000 |
| commit | 75561d1a72a25c750e24f413b77e6b9193cba310 (patch) | |
| tree | 270bd34894957da058d85416c3aad7b9ab166fbe | |
| parent | f545f15470c9da0fe3f65ca1f37b782a85216e60 (diff) | |
| parent | 053b6294722165faa1259321781e36670e3cceee (diff) | |
| download | git-review-75561d1a72a25c750e24f413b77e6b9193cba310.tar.gz | |
Merge "Fix submitting signed patches"
| -rw-r--r-- | git_review/cmd.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/git_review/cmd.py b/git_review/cmd.py index 5b65812..9291767 100644 --- a/git_review/cmd.py +++ b/git_review/cmd.py @@ -984,8 +984,8 @@ def assert_one_change(remote, branch, yes, have_hook): use_color = "--color=always" else: use_color = "--color=never" - cmd = ("git log %s --decorate --oneline HEAD --not --remotes=%s" % ( - use_color, remote)) + cmd = ("git log %s --decorate --oneline --no-show-signature " + "HEAD --not --remotes=%s" % (use_color, remote)) (status, output) = run_command_status(cmd) if status != 0: print("Had trouble running %s" % cmd) diff --git a/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml b/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml new file mode 100644 index 0000000..da26d99 --- /dev/null +++ b/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + Git's log.ShowSignature option is now supported. Previously, + setting it would confuse git-review into thinking there were + twice as many changes to push. +upgrade: + - | + Git 2.10.0 or later is required as git-review now needs the + ``--no-show-signature`` option for git-log. |