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

Merge branch 'sb/diff-color-move-more'

Browse Source 
Bugfix.

* sb/diff-color-move-more:
  diff: fix --color-moved-ws=allow-indentation-change
This commit is contained in:
Junio C Hamano 2018-09-24 10:30:48 -07:00
commit dda26650bf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diff.c
View File

@ -980,9 +980,14 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o,
/* Carry the white space delta forward */ /* Carry the white space delta forward */
pmb[i]->next_line->wsd = pmb[i]->wsd; pmb[i]->next_line->wsd = pmb[i]->wsd;
pmb[i] = pmb[i]->next_line; pmb[i] = pmb[i]->next_line;
} else } else {
if (pmb[i]->wsd) {
free(pmb[i]->wsd->string);
FREE_AND_NULL(pmb[i]->wsd);
}
pmb[i] = NULL; pmb[i] = NULL;
} }
}
} }
static int shrink_potential_moved_blocks(struct moved_entry **pmb, static int shrink_potential_moved_blocks(struct moved_entry **pmb,
@ -1002,10 +1007,6 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
if (lp < pmb_nr && rp > -1 && lp < rp) { if (lp < pmb_nr && rp > -1 && lp < rp) {
pmb[lp] = pmb[rp]; pmb[lp] = pmb[rp];
if (pmb[rp]->wsd) {
free(pmb[rp]->wsd->string);
FREE_AND_NULL(pmb[rp]->wsd);
}
pmb[rp] = NULL; pmb[rp] = NULL;
rp--; rp--;
lp++; lp++;