sequencer: pass explicit --no-gpg-sign to merge
The merge subcommand launched for merges with non-default strategy would use its own default behaviour to decide how to sign commits, regardless of what opts->gpg_sign was set to. For example the --no-gpg-sign flag given to rebase explicitly would get ignored, if commit.gpgsign was set to true. Fix the issue and add a test case excercising this behaviour. Signed-off-by: Samuel Čavoj <samuel@cavoj.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Samuel Čavoj committed
Oct 18, 2020 at 01:15 UTC
19dad040ed19761e8d6d63b4efd03ad846b81d06
2 files changed
+9
sequencer.c
+2
@@ -3678,6 +3678,8 @@ static int do_merge(struct repository *r,
3678
strvec_push(&cmd.args, git_path_merge_msg(r));
3679
if (opts->gpg_sign)
3680
strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
3681
+ else
3682
+ strvec_push(&cmd.args, "--no-gpg-sign");
3683
3684
/* Add the tips to be merged */
3685
for (j = to_merge; j; j = j->next)
t/t3435-rebase-gpg-sign.sh
+7
@@ -89,4 +89,11 @@ test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign
89
git verify-commit HEAD
90
'
91
92
+test_expect_success "rebase -r, merge strategy, commit.gpgsign=true --no-gpg-sign won't sign commit" '
93
+ git reset --hard merged &&
94
+ git config commit.gpgsign true &&
95
+ git rebase -fr --no-gpg-sign -s resolve --root &&
96
+ test_must_fail git verify-commit HEAD
97
+'
98
+
99
test_done