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>
Phillip Wood committed
Nov 10, 2017 at 11:09 UTC
60b6158886b1b502c75f12facff9df45e731112b
1 file changed
+4
t/t3404-rebase-interactive.sh
+4
@@ -453,6 +453,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
453
git rebase -i $base &&
454
git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
455
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\." &&
460
git checkout to-be-rebased &&
461
git branch -D squash-fixup
462
'