mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-23 06:45:09 +02:00
Code

Merge branch 'pw/word-diff-zero-width-matches' into next 

The word-diff mode has been taught to work better with a word
regexp that can match an empty string.

* pw/word-diff-zero-width-matches:
  word diff: handle zero length matches
This commit is contained in:
Junio C Hamano 2021-05-06 13:57:31 +09:00
parent 644a1bc4ee 0324e8fc6b
commit e5653da568
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diff.c
View File

@ -2053,7 +2053,7 @@ static void fn_out_diff_words_aux(void *priv,
static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
int *begin, int *end)
{
if (word_regex && *begin < buffer->size) {
while (word_regex && *begin < buffer->size) {
regmatch_t match[1];
if (!regexec_buf(word_regex, buffer->ptr + *begin,
buffer->size - *begin, 1, match, 0)) {
@ -2061,9 +2061,13 @@ static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
'\n', match[0].rm_eo - match[0].rm_so);
*end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
*begin += match[0].rm_so;
return *begin >= *end;
if (*begin == *end)
(*begin)++;
else
return *begin > *end;
} else {
return -1;
}
return -1;
}
/* find the next word */

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

@ -184,6 +184,11 @@ test_expect_success 'word diff with a regular expression' '
word_diff --color-words="[a-z]+"
'
test_expect_success 'word diff with zero length matches' '
cp expect.letter-runs-are-words expect &&
word_diff --color-words="[a-z${LF}]*"
'
test_expect_success 'set up a diff driver' '
git config diff.testdriver.wordRegex "[^[:space:]]" &&
cat <<-\EOF >.gitattributes