Signed-Off-By: Boyd Stephen Smith Jr. <bss@xxxxxxxxxxxxxxxxx> --- On Monday 19 January 2009, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote about 'Re: [PATCH v4 0/7] customizable --color-words': >On Mon, 19 Jan 2009, Santi Béjar wrote: >> Also, having a config (diff.color-words?) to set the default regexp >> would be great. Thanks. > >From "git log --author==Santi --stat" it seems that you are quite capable >of providing that patch. > >A few pointers: > >- Add a test to t4034 that tests that the config sets a default, and that > the command line can override it. Here's a couple tests to get someone started, adds one "known breakage" to the results of the test suite. This is to be applied on top of the existing patches. Yes, I also think I'll work on the actual implementation, but I'd be glad to have someone beat me to it. I'm not sure why the diff is crazy long. t/t4034-diff-words.sh | 50 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 14 deletions(-) diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 744221b..6ebce9d 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -63,7 +63,7 @@ test_expect_success 'word diff with runs of whitespace' ' ' -cat > expect <<\EOF +cat > expect.letter-runs-are-words <<\EOF <WHITE>diff --git a/pre b/post<RESET> <WHITE>index 330b04f..5ed8eff 100644<RESET> <WHITE>--- a/pre<RESET> @@ -77,6 +77,7 @@ a = b + c<RESET> <GREEN>aeff = aeff * ( aaa<RESET> ) EOF +cp expect.letter-runs-are-words expect test_expect_success 'word diff with a regular expression' ' @@ -84,21 +85,11 @@ test_expect_success 'word diff with a regular expression' ' ' -test_expect_success 'set a diff driver' ' - git config diff.testdriver.wordregex "[^[:space:]]" && - cat <<EOF > .gitattributes -pre diff=testdriver -post diff=testdriver -EOF -' - -test_expect_success 'option overrides default' ' - - word_diff --color-words="[a-z]+" - +test_expect_success 'add configuration for default regex' ' + git config diff.color-words "[^[:space:]]" ' -cat > expect <<\EOF +cat > expect.non-whitespace-is-word <<\EOF <WHITE>diff --git a/pre b/post<RESET> <WHITE>index 330b04f..5ed8eff 100644<RESET> <WHITE>--- a/pre<RESET> @@ -112,6 +103,37 @@ a = b + c<RESET> <GREEN>aeff = aeff * ( aaa )<RESET> EOF +cp expect.non-whitespace-is-word expect + +test_expect_failure 'use default supplied by config' ' + + word_diff --color-words + +' + +cp expect.letter-runs-are-words expect + +test_expect_success 'option overrides config-default' ' + + word_diff --color-words="[a-z]+" + +' + +test_expect_success 'set a diff driver' ' + git config diff.testdriver.wordregex "[^[:space:]]" && + cat <<EOF > .gitattributes +pre diff=testdriver +post diff=testdriver +EOF +' + +test_expect_success 'option overrides default' ' + + word_diff --color-words="[a-z]+" + +' + +cp expect.non-whitespace-is-word expect test_expect_success 'use default supplied by driver' ' -- 1.5.6.5 -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/ -- 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
