diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:32 +0300 |
| commit | 7e94720c1ea42605a8f380802cfe90ec5e2477a2 (patch) | |
| tree | 6415fbb0027f1024a84085d5fe0e6fe8e723c330 /t/t3415-rebase-autosquash.sh | |
| parent | e5abed92f50e39bf9514061ddd8e04c64d0a45d8 (diff) | |
| parent | f7d42ceec5265f6dbcaeb527657521b7ec8ddc94 (diff) | |
Merge branch 'js/rebase-i-commit-cleanup-fix'
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
* js/rebase-i-commit-cleanup-fix:
rebase -i: do leave commit message intact in fixup! chains
Diffstat (limited to 't/t3415-rebase-autosquash.sh')
| -rwxr-xr-x | t/t3415-rebase-autosquash.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index e7087befd4..36f169d7f1 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -443,4 +443,12 @@ test_expect_success 'fixup a fixup' ' test XZWY = $(git show | tr -cd W-Z) ' +test_expect_success 'fixup does not clean up commit message' ' + oneline="#818" && + git commit --allow-empty -m "$oneline" && + git commit --fixup HEAD --allow-empty && + git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 && + test "$oneline" = "$(git show -s --format=%s)" +' + test_done |