From: Johannes Sixt <j.sixt@viscovery.net>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] Demonstrate a bug in --word-diff where diff.*.wordregex is "sticky"
Date: Wed, 14 Mar 2012 17:39:38 +0100 [thread overview]
Message-ID: <4F60C9CA.1040109@viscovery.net> (raw)
From: Johannes Sixt <j6t@kdbg.org>
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.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
What's going on here?
t/t4034-diff-words.sh | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 5c20121..1ad7ab5 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -348,4 +348,37 @@ 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 &&
+ echo "a b; c" >z &&
+ git add a z &&
+ git commit -minitial &&
+
+ # modify both
+ echo "a bx; c" >a &&
+ echo "a bx; c" >z &&
+ git commit -mmodified -a
+'
+
+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]+|." &&
+ 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
--
1.7.9.rc2.96.g8a78a
reply other threads:[~2012-03-14 16:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F60C9CA.1040109@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).