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>

diff --git a/sequencer.c b/sequencer.c
index 88ccff4838d274dd57570d914a2114ac55a59a00..043d606829186e0b0baddbb721ab27b324c57ed8 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3678,6 +3678,8 @@ static int do_merge(struct repository *r,
                strvec_push(&cmd.args, git_path_merge_msg(r));
                if (opts->gpg_sign)
                        strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+               else
+                       strvec_push(&cmd.args, "--no-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 a2b7625707cde552e88b9cb8f33cebfb1a6a5999..2fba21f77a0c270ca0bf0a9b06b3741725f1e0b9 100755 (executable)
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -89,4 +89,11 @@ test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign
        git verify-commit HEAD
 '
 
+test_expect_success "rebase -r, merge strategy, commit.gpgsign=true --no-gpg-sign won't sign commit" '
+       git reset --hard merged &&
+       git config commit.gpgsign true &&
+       git rebase -fr --no-gpg-sign -s resolve --root &&
+       test_must_fail git verify-commit HEAD
+'
+
 test_done