| Message ID | 20201013213021.3671432-2-samuel@cavoj.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/3] t3435: use `test_config` instead of `git config` | expand |
Samuel Čavoj <samuel@cavoj.net> 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.
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); /* 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 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 && + 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 && + git rebase -fr -s resolve --root && + git verify-commit HEAD +' + test_done
When performing a rebase with --rebase-merges using either a custom strategy specified with -s or an octopus merge, and at the same time having gpgsign enabled (either rebase -S or config commit.gpgsign), the operation would fail on making the merge commit. Instead of "-S%s" with the key id substituted, only the bare key id would get passed to the underlying merge command, which tried to interpret it as a ref. Fix the issue and add test cases as suggested by Johannes Schindelin. Signed-off-by: Samuel Čavoj <samuel@cavoj.net> --- changed v2 -> v3: - first test is now okay, thanks to patch 1/3 - added another test for config commit.gpgsign --- sequencer.c | 2 +- t/t3435-rebase-gpg-sign.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)