The next patch uses a non-whitespace regex, similar to the regex
currently used by the 'testdriver' diff driver; replace the regex with a
distinct one so that we can continue to conclude its effects.
Signed-off-by: Tay Ray Chuan <rctay89@xxxxxxxxx>
---
Kept separate to keep the next patch clean.
---
t/t4034-diff-words.sh | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 6f1e5a2..9ae0e1a 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -46,6 +46,20 @@ cat >expect.non-whitespace-is-word <<-\EOF
<GREEN>aeff = aeff * ( aaa )<RESET>
EOF
+cat >expect.everything-is-word <<-\EOF
+ <BOLD>diff --git a/pre b/post<RESET>
+ <BOLD>index 330b04f..5ed8eff 100644<RESET>
+ <BOLD>--- a/pre<RESET>
+ <BOLD>+++ b/post<RESET>
+ <CYAN>@@ -1,3 +1,7 @@<RESET>
+ <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
+
+ a = b + c<RESET>
+
+ <GREEN>aa = a<RESET>
+
+ <GREEN>aeff = aeff * ( aaa )<RESET>
+EOF
word_diff () {
test_must_fail git diff --no-index "$@" pre post >output &&
@@ -179,7 +193,7 @@ test_expect_success 'word diff with a regular expression' '
'
test_expect_success 'set up a diff driver' '
- git config diff.testdriver.wordRegex "[^[:space:]]" &&
+ git config diff.testdriver.wordRegex ".+" &&
cat <<-\EOF >.gitattributes
pre diff=testdriver
post diff=testdriver
@@ -192,7 +206,7 @@ test_expect_success 'option overrides .gitattributes' '
'
test_expect_success 'use regex supplied by driver' '
- cp expect.non-whitespace-is-word expect &&
+ cp expect.everything-is-word expect &&
word_diff --color-words
'
@@ -224,7 +238,7 @@ test_expect_success 'command-line overrides config: --word-diff-regex' '
'
test_expect_success '.gitattributes override config' '
- cp expect.non-whitespace-is-word expect &&
+ cp expect.everything-is-word expect &&
word_diff --color-words
'
--
1.7.7.584.g16d0ea
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html