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@xxxxxxxxx>
---
v2 -> v3:
- added test case
---
sequencer.c | 2 ++
t/t3435-rebase-gpg-sign.sh | 7 +++++++
2 files changed, 9 insertions(+)
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)
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index 9d2faffa03..773c2a1d72 100755
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -81,4 +81,11 @@ test_expect_success 'rebase -r, GPG config and merge strategies' '
git verify-commit HEAD
'
+test_expect_success 'rebase -r, --no-gpg-sign and merge strategies' '
+ git reset --hard merged &&
+ test_config commit.gpgsign true &&
+ git rebase -fr --no-gpg-sign -s resolve --root &&
+ test_must_fail git verify-commit HEAD
+'
+
test_done
--
2.28.0
