diff options
| author | Samuel Čavoj <samuel@cavoj.net> | 2020-10-17 23:15:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-18 20:08:31 (GMT) |
| commit | ae03c97ac0e36a33183562464f9506c8b3a73060 (patch) | |
| tree | bb3dd39cac6bf83feedbe2f29a13e06de8409229 /t/t3435-rebase-gpg-sign.sh | |
| parent | d4a392452e292ff924e79ec8458611c0f679d6d4 (diff) | |
| download | git-ae03c97ac0e36a33183562464f9506c8b3a73060.zip git-ae03c97ac0e36a33183562464f9506c8b3a73060.tar.gz git-ae03c97ac0e36a33183562464f9506c8b3a73060.tar.bz2 | |
sequencer: fix gpg option passed to merge subcommand
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 and
Junio C Hamano.
Signed-off-by: Samuel Čavoj <samuel@cavoj.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3435-rebase-gpg-sign.sh')
| -rwxr-xr-x | t/t3435-rebase-gpg-sign.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh index b47c59c..a2b7625 100755 --- a/t/t3435-rebase-gpg-sign.sh +++ b/t/t3435-rebase-gpg-sign.sh @@ -68,4 +68,25 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' test_must_fail git verify-commit HEAD ' +test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' ' + git reset --hard merged && + test_unconfig commit.gpgsign && + git rebase -fr --gpg-sign -s resolve --root && + git verify-commit HEAD +' + +test_expect_success 'rebase -r, merge strategy, commit.gpgsign=true will sign commit' ' + git reset --hard merged && + git config commit.gpgsign true && + git rebase -fr -s resolve --root && + git verify-commit HEAD +' + +test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign will sign commit' ' + git reset --hard merged && + git config commit.gpgsign false && + git rebase -fr --gpg-sign -s resolve --root && + git verify-commit HEAD +' + test_done |