[PATCH] t4034: Test parsing words following newline
From: Lucian Poston <hidden>
Date: 2016-06-15 23:07:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
Add test that shows diff --word-diff's inconsistent placement of removed words. This occurs when both the removed word is first on its line and the previous line has a removed word. Signed-off-by: Lucian Poston <redacted> --- t/t4034-diff-words.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index f2f55fc..8d9f1b7 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh@@ -265,6 +265,36 @@ test_expect_success 'test parsing words for newline' ' word_diff --color-words="a+" ' +test_expect_success 'test parsing words following newline' ' + cat >pre <<-\EOF && + 11aa + 11aa + + 11aa + 11aa + EOF + cat >post <<-\EOF && + 11aa + aa + + aa + aa + EOF + cat >expect <<-\EOF && + <BOLD>diff --git a/pre b/post<RESET> + <BOLD>index 2e0acd4..f6e6721 100644<RESET> + <BOLD>--- a/pre<RESET> + <BOLD>+++ b/post<RESET> + <CYAN>@@ -1,5 +1,5 @@<RESET> + 11aa<RESET> + <RED>11<RESET>aa + + <RED>11<RESET>aa + <RED>11<RESET>aa + EOF + word_diff --color-words="a+|1+" +' + test_expect_success 'test when words are only removed at the end' ' echo "(:" >pre && echo "(" >post &&
--
2.4.10