]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: pass explicit --no-gpg-sign to merge
authorSamuel Čavoj <samuel@cavoj.net>
Sat, 17 Oct 2020 23:15:56 +0000 (01:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Oct 2020 20:08:32 +0000 (13:08 -0700)
commit19dad040ed19761e8d6d63b4efd03ad846b81d06
tree21721f08b919d84675848a3979179199f6525b0c
parentae03c97ac0e36a33183562464f9506c8b3a73060
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>
sequencer.c
t/t3435-rebase-gpg-sign.sh