Re: [PATCH] sequencer: fix gpg option passed to octopus merge
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 12, 2020, 20:55 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2010122239430.50@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqqy2kbns5l.fsf@gitster.c.googlers.com>
Hi,
On Mon, 12 Oct 2020, Junio C Hamano wrote:
Show 11 quoted lines
> Samuel Čavoj <samuel@cavoj.net> writes: > > > Subject: Re: [PATCH] sequencer: fix gpg option passed to octopus merge > > Puzzling. Why do you single out octopus merge like this? > > sequencer.c::do_merge() is called from pick_commits() whenever we > see a "merge" insn, and not limited to an octopus merge. > > Can we have a test to demonstrate the existing failure, so that we > can notice if this fix is broken in the future?
Yes, now that I understand that not only octopus merges are affected, I would be very much in favor of adding a test case.
If I may suggest to add a new test case to t3435 based on t3430's '--rebase-merges with strategies' and t3404's 'rebase -i --gpg-sign=<key-id>'? Something along these lines:
-- snipsnap --
diff --git a/sequencer.c b/sequencer.c index 00acb124962..88ccff4838d 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 b47c59c190b..f70b280f5c1 100755 --- a/t/t3435-rebase-gpg-sign.sh +++ b/t/t3435-rebase-gpg-sign.sh @@ -68,4 +68,10 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' test_must_fail git verify-commit HEAD ' +test_expect_success 'rebase -r, GPG and merge strategies' ' + git reset --hard merged && + git rebase -fr --gpg-sign -s resolve --root && + git verify-commit HEAD +' + test_done