diff options
author | Samuel Čavoj <samuel@cavoj.net> | 2020-10-18 02:15:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-18 23:08:32 +0300 |
commit | 19dad040ed19761e8d6d63b4efd03ad846b81d06 (patch) | |
tree | 21721f08b919d84675848a3979179199f6525b0c /sequencer.c | |
parent | ae03c97ac0e36a33183562464f9506c8b3a73060 (diff) |
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>
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 88ccff4838..043d606829 100644 --- 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) |