opendev/git-review
Code Issues Proposed changes

Fix submitting signed patches

Browse Source 
When a commit is signed and the git config contains the setting
log.ShowSignature=True, even the "--oneline" git log output for it will
include multiple lines (the output from gpg verifying the signature),
thus fooling us into assuming that multiple commits are to be submitted.
Override the option to make sure we always get one line per commit only.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Id4528209f1cd500afd06e2e61eb5689022251118
This commit is contained in:
Dr. Jens Harbott
2022-01-03 16:45:06 +01:00
committed by Jeremy Stanley
parent f1851f732a
commit 053b629472
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git_review/cmd.py
View File

@@ -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)