From: Phillip Wood Date: Fri, 10 Nov 2017 11:09:41 +0000 (+0000) Subject: t3404: check intermediate squash messages X-Git-Tag: v2.17.0-rc0~110^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60b6158886b1b502c75f12facff9df45e731112b;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6a82d1ed87..9ed0a244e6 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -453,6 +453,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa git rebase -i $base && git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && test_cmp expect-squash-fixup actual-squash-fixup && + git cat-file commit HEAD@{2} | + grep "^# This is a combination of 3 commits\." && + git cat-file commit HEAD@{3} | + grep "^# This is a combination of 2 commits\." && git checkout to-be-rebased && git branch -D squash-fixup '