diff options
| author |  Samuel Čavoj <samuel@cavoj.net> | 2020-10-18 01:15:56 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-18 13:08:32 -0700 |
| commit | 19dad040ed19761e8d6d63b4efd03ad846b81d06 (patch) | |
| tree | 21721f08b919d84675848a3979179199f6525b0c /builtin | |
| parent | sequencer: fix gpg option passed to merge subcommand (diff) | |
| download | tgif-19dad040ed19761e8d6d63b4efd03ad846b81d06.tar.xz | |
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 'builtin')
0 files changed, 0 insertions, 0 deletions