Skip to content

Commit 60b6158

Browse files
phillipwoodgitster
authored andcommitted
t3404: check intermediate squash messages
When there is more than one squash/fixup command in a row check the intermediate messages are correct. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 4123bca commit 60b6158

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
453453
git rebase -i $base &&
454454
git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
455455
test_cmp expect-squash-fixup actual-squash-fixup &&
456+
git cat-file commit HEAD@{2} |
457+
grep "^# This is a combination of 3 commits\." &&
458+
git cat-file commit HEAD@{3} |
459+
grep "^# This is a combination of 2 commits\." &&
456460
git checkout to-be-rebased &&
457461
git branch -D squash-fixup
458462
'

0 commit comments

Comments
 (0)