diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:27 +0300 |
| commit | 6e21f716f89d190017fa675738e9e7cc1a74680a (patch) | |
| tree | c40a0caddb625b949806c323c66d404e98ff2588 /t | |
| parent | a5619d4f8d91a179d0e21aa16fda52fb4f0f7eaf (diff) | |
| parent | 8ef6aad664715c16caf6e36a7f6b174a06574477 (diff) | |
Merge branch 'jk/commit-edit-fixup-fix'
"git commit --fixup" now works with "--edit" again, after it was
broken in v2.32.
* jk/commit-edit-fixup-fix:
commit: restore --edit when combined with --fixup
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7500-commit-template-squash-signoff.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh index 54c2082acb..8dd0f98812 100755 --- a/t/t7500-commit-template-squash-signoff.sh +++ b/t/t7500-commit-template-squash-signoff.sh @@ -270,7 +270,7 @@ EOF test_expect_success 'commit --fixup provides correct one-line commit message' ' commit_for_rebase_autosquash_setup && - git commit --fixup HEAD~1 && + EDITOR="echo ignored >>" git commit --fixup HEAD~1 && commit_msg_is "fixup! target message subject line" ' @@ -281,6 +281,13 @@ test_expect_success 'commit --fixup -m"something" -m"extra"' ' extra" ' +test_expect_success 'commit --fixup --edit' ' + commit_for_rebase_autosquash_setup && + EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit && + commit_msg_is "fixup! target message subject linesomething +extra" +' + get_commit_msg () { rev="$1" && git log -1 --pretty=format:"%B" "$rev" |