Samuel Čavoj <samuel@xxxxxxxxx> writes: > diff --git a/sequencer.c b/sequencer.c > index 00acb12496..88ccff4838 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -3677,7 +3677,7 @@ static int do_merge(struct repository *r, > strvec_push(&cmd.args, "-F"); > strvec_push(&cmd.args, git_path_merge_msg(r)); > if (opts->gpg_sign) > - strvec_push(&cmd.args, opts->gpg_sign); > + strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); Good. And later you'd add "else" to explicitly turn it off, I presume? > diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh > index 696cb6b6a4..9d2faffa03 100755 > --- a/t/t3435-rebase-gpg-sign.sh > +++ b/t/t3435-rebase-gpg-sign.sh > @@ -68,4 +68,17 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' > test_must_fail git verify-commit HEAD > ' > > +test_expect_success 'rebase -r, GPG --gpg-sign and merge strategies' ' > + git reset --hard merged && Insert test_unconfig commit.gpgsign && here. That would make it explicit that we are checking the base case where only the command line option is given. > + git rebase -fr --gpg-sign -s resolve --root && > + git verify-commit HEAD > +' > + > +test_expect_success 'rebase -r, GPG config and merge strategies' ' > + git reset --hard merged && > + test_config commit.gpgsign true && Use "git config" for consistency. > + git rebase -fr -s resolve --root && > + git verify-commit HEAD > +' > + We'd want another one, which is to give --gpg-sign from the command line when this is in effect: git config commit.gpgsign false i.e. not "test_unconfig" that removes the configuration, but explicitly configured not to sign Thanks.
