3 test_description='word diff colors'
7 test_expect_success setup '
9 git config diff.color.old red
10 git config diff.color.new green
16 -e 's/.\[1m/<WHITE>/g' \
17 -e 's/.\[31m/<RED>/g' \
18 -e 's/.\[32m/<GREEN>/g' \
19 -e 's/.\[36m/<BROWN>/g' \
24 test_must_fail git diff --no-index "$@" pre post > output &&
25 decrypt_color < output > output.decrypted &&
26 test_cmp expect output.decrypted
46 <WHITE>diff --git a/pre b/post<RESET>
47 <WHITE>index 330b04f..5ed8eff 100644<RESET>
48 <WHITE>--- a/pre<RESET>
49 <WHITE>+++ b/post<RESET>
50 <BROWN>@@ -1,3 +1,7 @@<RESET>
51 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
57 <GREEN>aeff = aeff * ( aaa )<RESET>
60 test_expect_success 'word diff with runs of whitespace' '
62 word_diff --color-words
67 <WHITE>diff --git a/pre b/post<RESET>
68 <WHITE>index 330b04f..5ed8eff 100644<RESET>
69 <WHITE>--- a/pre<RESET>
70 <WHITE>+++ b/post<RESET>
71 <BROWN>@@ -1,3 +1,7 @@<RESET>
72 h(4),<GREEN>hh<RESET>[44]
78 <GREEN>aeff = aeff * ( aaa<RESET> )
81 test_expect_success 'word diff with a regular expression' '
83 word_diff --color-words="[a-z]+"
87 test_expect_success 'set a diff driver' '
88 git config diff.testdriver.wordregex "[^[:space:]]" &&
89 cat <<EOF > .gitattributes
95 test_expect_success 'option overrides default' '
97 word_diff --color-words="[a-z]+"
102 <WHITE>diff --git a/pre b/post<RESET>
103 <WHITE>index 330b04f..5ed8eff 100644<RESET>
104 <WHITE>--- a/pre<RESET>
105 <WHITE>+++ b/post<RESET>
106 <BROWN>@@ -1,3 +1,7 @@<RESET>
107 h(4)<GREEN>,hh[44]<RESET>
113 <GREEN>aeff = aeff * ( aaa )<RESET>
116 test_expect_success 'use default supplied by driver' '
118 word_diff --color-words
122 echo 'aaa (aaa)' > pre
123 echo 'aaa (aaa) aaa' > post
126 <WHITE>diff --git a/pre b/post<RESET>
127 <WHITE>index c29453b..be22f37 100644<RESET>
128 <WHITE>--- a/pre<RESET>
129 <WHITE>+++ b/post<RESET>
130 <BROWN>@@ -1 +1 @@<RESET>
131 aaa (aaa) <GREEN>aaa<RESET>
134 test_expect_success 'test parsing words for newline' '
136 word_diff --color-words="a+"
145 <WHITE>diff --git a/pre b/post<RESET>
146 <WHITE>index 289cb9d..2d06f37 100644<RESET>
147 <WHITE>--- a/pre<RESET>
148 <WHITE>+++ b/post<RESET>
149 <BROWN>@@ -1 +1 @@<RESET>
153 test_expect_success 'test when words are only removed at the end' '
155 word_diff --color-words=.