]> Pileus Git - ~andy/git/commitdiff
t4034-diff-words: add a test for word diff without context
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 28 Oct 2009 12:24:30 +0000 (13:24 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2009 16:42:52 +0000 (09:42 -0700)
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4034-diff-words.sh

index 4508effcaacd3dbc8fadb13c7be0d631f4c946f1..82240cf44d6afe86ba173ddd5c1b4f6c3850417e 100755 (executable)
@@ -63,6 +63,26 @@ test_expect_success 'word diff with runs of whitespace' '
 
 '
 
+cat > expect <<\EOF
+<WHITE>diff --git a/pre b/post<RESET>
+<WHITE>index 330b04f..5ed8eff 100644<RESET>
+<WHITE>--- a/pre<RESET>
+<WHITE>+++ b/post<RESET>
+<BROWN>@@ -1 +1 @@<RESET>
+<RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
+<BROWN>@@ -3,0 +4,4 @@ a = b + c<RESET>
+
+<GREEN>aa = a<RESET>
+
+<GREEN>aeff = aeff * ( aaa )<RESET>
+EOF
+
+test_expect_failure 'word diff without context' '
+
+       word_diff --color-words --unified=0
+
+'
+
 cat > expect <<\EOF
 <WHITE>diff --git a/pre b/post<RESET>
 <WHITE>index 330b04f..5ed8eff 100644<RESET>