From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 1/2] t4034-diff-words: replace regex for diff driver
Date: Thu, 12 Jan 2012 01:25:01 +0800 [thread overview]
Message-ID: <1326302702-4536-1-git-send-email-rctay89@gmail.com> (raw)
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@gmail.com>
---
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
next reply other threads:[~2012-01-11 17:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 17:25 Tay Ray Chuan [this message]
2012-01-11 17:25 ` [PATCH 2/2] diff --word-diff: use non-whitespace regex by default Tay Ray Chuan
2012-01-11 20:05 ` Thomas Rast
2012-01-12 0:52 ` Tay Ray Chuan
2012-01-12 9:22 ` Thomas Rast
2012-01-18 7:32 ` Tay Ray Chuan
2012-01-19 15:53 ` Thomas Rast
2012-01-20 1:14 ` Tay Ray Chuan
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=1326302702-4536-1-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).