t4034: diff.*.wordregex should not be "sticky" in --word-diff
The test case applies a custom wordRegex to one file in a diff, and expects that the default word splitting applies to the second file in the diff. But the custom wordRegex is also incorrectly used for the second file. Helped-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a46034819e
commit
62d39359af
@ -3,6 +3,7 @@
|
||||
test_description='word diff colors'
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/diff-lib.sh
|
||||
|
||||
cat >pre.simple <<-\EOF
|
||||
h(4)
|
||||
@ -293,6 +294,10 @@ test_expect_success '--word-diff=none' '
|
||||
word_diff --word-diff=plain --word-diff=none
|
||||
'
|
||||
|
||||
test_expect_success 'unset default driver' '
|
||||
test_unconfig diff.wordregex
|
||||
'
|
||||
|
||||
test_language_driver bibtex
|
||||
test_language_driver cpp
|
||||
test_language_driver csharp
|
||||
@ -348,4 +353,35 @@ test_expect_success 'word-diff with no newline at EOF' '
|
||||
word_diff --word-diff=plain
|
||||
'
|
||||
|
||||
test_expect_success 'setup history with two files' '
|
||||
echo "a b; c" >a.tex &&
|
||||
echo "a b; c" >z.txt &&
|
||||
git add a.tex z.txt &&
|
||||
git commit -minitial &&
|
||||
|
||||
# modify both
|
||||
echo "a bx; c" >a.tex &&
|
||||
echo "a bx; c" >z.txt &&
|
||||
git commit -mmodified -a
|
||||
'
|
||||
|
||||
test_expect_failure 'wordRegex for the first file does not apply to the second' '
|
||||
echo "*.tex diff=tex" >.gitattributes &&
|
||||
git config diff.tex.wordRegex "[a-z]+|." &&
|
||||
cat >expect <<-\EOF &&
|
||||
diff --git a/a.tex b/a.tex
|
||||
--- a/a.tex
|
||||
+++ b/a.tex
|
||||
@@ -1 +1 @@
|
||||
a [-b-]{+bx+}; c
|
||||
diff --git a/z.txt b/z.txt
|
||||
--- a/z.txt
|
||||
+++ b/z.txt
|
||||
@@ -1 +1 @@
|
||||
a [-b;-]{+bx;+} c
|
||||
EOF
|
||||
git diff --word-diff HEAD~ >actual &&
|
||||
compare_diff_patch expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user