undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the spelling of "wordregex".

Browse Source 
Use "wordRegex" for configuration variable names.  Use "word_regex" for C
language tokens.

Signed-off-by: Boyd Stephen Smith Jr. <bss@iguanasuicide.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Boyd Stephen Smith Jr 2009-01-20 22:59:54 -06:00 committed by Junio C Hamano
parent 98a4d87b87
commit ae3b970ac3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -639,7 +639,7 @@ diff.suppress-blank-empty::
A boolean to inhibit the standard behavior of printing a space A boolean to inhibit the standard behavior of printing a space
before each empty output line. Defaults to false. before each empty output line. Defaults to false.
diff.wordregex:: diff.wordRegex::
A POSIX Extended Regular Expression used to determine what is a "word" A POSIX Extended Regular Expression used to determine what is a "word"
when performing word-by-word difference calculations. Character when performing word-by-word difference calculations. Character
sequences that match the regular expression are "words", all other sequences that match the regular expression are "words", all other

4
Documentation/gitattributes.txt
View File

@ -341,14 +341,14 @@ Customizing word diff
You can customize the rules that `git diff --color-words` uses to You can customize the rules that `git diff --color-words` uses to
split words in a line, by specifying an appropriate regular expression split words in a line, by specifying an appropriate regular expression
in the "diff.*.wordregex" configuration variable. For example, in TeX in the "diff.*.wordRegex" configuration variable. For example, in TeX
a backslash followed by a sequence of letters forms a command, but a backslash followed by a sequence of letters forms a command, but
several such commands can be run together without intervening several such commands can be run together without intervening
whitespace. To separate them, use a regular expression such as whitespace. To separate them, use a regular expression such as
------------------------ ------------------------
[diff "tex"] [diff "tex"]
wordregex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
------------------------ ------------------------
A built-in pattern is provided for all languages listed in the A built-in pattern is provided for all languages listed in the

8
t/t4034-diff-words.sh
View File

@ -86,7 +86,7 @@ test_expect_success 'word diff with a regular expression' '
' '
test_expect_success 'set a diff driver' ' test_expect_success 'set a diff driver' '
git config diff.testdriver.wordregex "[^[:space:]]" && git config diff.testdriver.wordRegex "[^[:space:]]" &&
cat <<EOF > .gitattributes cat <<EOF > .gitattributes
pre diff=testdriver pre diff=testdriver
post diff=testdriver post diff=testdriver
@ -121,8 +121,8 @@ test_expect_success 'use regex supplied by driver' '
' '
test_expect_success 'set diff.wordregex option' ' test_expect_success 'set diff.wordRegex option' '
git config diff.wordregex "[[:alnum:]]+" git config diff.wordRegex "[[:alnum:]]+"
' '
cp expect.letter-runs-are-words expect cp expect.letter-runs-are-words expect
@ -138,7 +138,7 @@ test_expect_success '.gitattributes override config' '
' '
test_expect_success 'remove diff driver regex' ' test_expect_success 'remove diff driver regex' '
git config --unset diff.testdriver.wordregex git config --unset diff.testdriver.wordRegex
' '
cat > expect <<\EOF cat > expect <<\EOF

4
userdiff.c
View File

@ -6,8 +6,8 @@ static struct userdiff_driver *drivers;
static int ndrivers; static int ndrivers;
static int drivers_alloc; static int drivers_alloc;
#define PATTERNS(name, pattern, wordregex) \ #define PATTERNS(name, pattern, word_regex) \
{ name, NULL, -1, { pattern, REG_EXTENDED }, wordregex } { name, NULL, -1, { pattern, REG_EXTENDED }, word_regex }
static struct userdiff_driver builtin_drivers[] = { static struct userdiff_driver builtin_drivers[] = {
PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$",
"[^<>= \t]+|[^[:space:]]|[\x80-\xff]+"), "[^<>= \t]+|[^[:space:]]|[\x80-\xff]+"),