diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-11-10 11:09:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-11 03:33:26 +0900 |
| commit | 60b6158886b1b502c75f12facff9df45e731112b (patch) | |
| tree | 7153b840b20f1eddb8d7b1f8e0d36a921300d45c | |
| parent | RelNotes: the third batch for 2.16 (diff) | |
| download | tgif-60b6158886b1b502c75f12facff9df45e731112b.tar.xz | |
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>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 ' |