From: "Samuel Čavoj" <samuel@cavoj.net>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: "Phillip Wood" <phillip.wood123@gmail.com>,
"Samuel Čavoj" <samuel@cavoj.net>
Subject: [PATCH v3 2/3] sequencer: fix gpg option passed to merge subcommand
Date: Tue, 13 Oct 2020 23:30:23 +0200 [thread overview]
Message-ID: <20201013213021.3671432-2-samuel@cavoj.net> (raw)
In-Reply-To: <20201013213021.3671432-1-samuel@cavoj.net>
When performing a rebase with --rebase-merges using either a custom
strategy specified with -s or an octopus merge, and at the same time
having gpgsign enabled (either rebase -S or config commit.gpgsign), the
operation would fail on making the merge commit. Instead of "-S%s" with
the key id substituted, only the bare key id would get passed to the
underlying merge command, which tried to interpret it as a ref.
Fix the issue and add test cases as suggested by Johannes Schindelin.
Signed-off-by: Samuel Čavoj <samuel@cavoj.net>
---
changed v2 -> v3:
- first test is now okay, thanks to patch 1/3
- added another test for config commit.gpgsign
---
sequencer.c | 2 +-
t/t3435-rebase-gpg-sign.sh | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 00acb12496..88ccff4838 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3677,7 +3677,7 @@ static int do_merge(struct repository *r,
strvec_push(&cmd.args, "-F");
strvec_push(&cmd.args, git_path_merge_msg(r));
if (opts->gpg_sign)
- strvec_push(&cmd.args, opts->gpg_sign);
+ strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
/* Add the tips to be merged */
for (j = to_merge; j; j = j->next)
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index 696cb6b6a4..9d2faffa03 100755
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -68,4 +68,17 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
test_must_fail git verify-commit HEAD
'
+test_expect_success 'rebase -r, GPG --gpg-sign and merge strategies' '
+ git reset --hard merged &&
+ git rebase -fr --gpg-sign -s resolve --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, GPG config and merge strategies' '
+ git reset --hard merged &&
+ test_config commit.gpgsign true &&
+ git rebase -fr -s resolve --root &&
+ git verify-commit HEAD
+'
+
test_done
--
2.28.0
next prev parent reply other threads:[~2020-10-14 9:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 21:30 [PATCH v3 1/3] t3435: use `test_config` instead of `git config` Samuel Čavoj
2020-10-13 21:30 ` Samuel Čavoj [this message]
2020-10-15 16:47 ` [PATCH v3 2/3] sequencer: fix gpg option passed to merge subcommand Junio C Hamano
2020-10-13 21:30 ` [PATCH v3 3/3] sequencer: pass explicit --no-gpg-sign to merge Samuel Čavoj
2020-10-15 17:02 ` Junio C Hamano
2020-10-17 22:02 ` Samuel Čavoj
2020-10-17 22:34 ` Junio C Hamano
2020-10-17 23:16 ` Samuel Čavoj
2020-10-15 16:43 ` [PATCH v3 1/3] t3435: use `test_config` instead of `git config` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201013213021.3671432-2-samuel@cavoj.net \
--to=samuel@cavoj.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).