development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 06:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff: fix --color-moved-ws=allow-indentation-change

Browse source 
If there is more than one potential moved block and the longest block
is not the first element of the array of potential blocks then the
block is cut short. With --color-moved=blocks this can leave moved
lines unpainted if the shortened block does not meet the block length
requirement. With --color-moved=zebra then in addition to the
unpainted lines the moved color can change in the middle of a single
block.

Fix this by freeing the whitespace delta of the match we're discarding
rather than the one we're keeping.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Acked-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2018-09-04 14:52:58 +01:00 committed by Junio C Hamano
parent 626c0b5d39
commit fab01ec52e
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

@ -955,8 +955,13 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o,
/* Carry the white space delta forward */
pmb[i]->next_line->wsd = pmb[i]->wsd;
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;
}
}
}
@ -977,10 +982,6 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
if (lp < pmb_nr && rp > -1 && lp < rp) {
pmb[lp] = pmb[rp];
if (pmb[rp]->wsd) {
free(pmb[rp]->wsd->string);
FREE_AND_NULL(pmb[rp]->wsd);
}
pmb[rp] = NULL;
rp--;
lp++;