Thomas Rast <trast@xxxxxxxxxxxxxxx> writes:
> From: Johannes Sixt <j6t@xxxxxxxx>
>
> 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.
>
> [tr: unset the diff.wordRegex variable to make the test meaningful]
>
> Signed-off-by: Johannes Sixt <j6t@xxxxxxxx>
> Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
> ---
>
> Compared to your version, I added the first hunk. Otherwise the
> diff.wordRegex=[[:alnum:]]+ setting carries over and makes the test
> fail even with the bug fixed.
>
> I deliberately put it as early as possible, rather than into the setup
> for your test, to avoid confusion next time someone patches that file.
>
> t/t4034-diff-words.sh | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
> index 5c20121..69e81f3 100755
> --- a/t/t4034-diff-words.sh
> +++ b/t/t4034-diff-words.sh
> @@ -293,6 +293,10 @@ test_expect_success '--word-diff=none' '
> word_diff --word-diff=plain --word-diff=none
> '
>
> +test_expect_success 'unset default driver' '
> + git config --unset diff.wordregex
> +'
Isn't this unsafe if some of the tests before this one failed?
test_unconfig diff.wordregex
By the way, I really loathe the change that gutted major parts out of
t/test-lib.sh and moved them to another file; now I have to eyeball two
files to write a response like this instead of one.
> +test_expect_failure 'wordRegex for the first file does not apply to the second' '
> + echo "a diff=tex" >.gitattributes &&
> + git config diff.tex.wordRegex "[a-z]+|." &&
The use of files "a" and "z" as an example of pair of a tex and non tex
input makes the test look overly artificial (why not a.tex vs z.txt or
something?), but other than that, looks cleanly done.
Thanks.
> + cat >expect <<-\EOF &&
> + diff --git a/a b/a
> + index 9823d38..b09f967 100644
> + --- a/a
> + +++ b/a
> + @@ -1 +1 @@
> + a [-b-]{+bx+}; c
> + diff --git a/z b/z
> + index 9823d38..b09f967 100644
> + --- a/z
> + +++ b/z
> + @@ -1 +1 @@
> + a [-b;-]{+bx;+} c
> + EOF
> + git diff --word-diff HEAD~ >actual
> + test_cmp expect actual
> +'
> +
> test_done
--
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