diff: fix --color-moved-ws=allow-indentation-change
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>
Phillip Wood committed
Sep 4, 2018 at 14:52 UTC
fab01ec52e83df886ca952879e196b8d8bd42013
1 file changed
+6
-5
diff.c
+6
-5
@@ -955,8 +955,13 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o,
955
/* Carry the white space delta forward */
956
pmb[i]->next_line->wsd = pmb[i]->wsd;
957
pmb[i] = pmb[i]->next_line;
958
- } else
958
+ } else {
959
+ if (pmb[i]->wsd) {
960
+ free(pmb[i]->wsd->string);
961
+ FREE_AND_NULL(pmb[i]->wsd);
962
+ }
963
pmb[i] = NULL;
964
+ }
965
}
966
}
967
@@ -977,10 +982,6 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
982
983
if (lp < pmb_nr && rp > -1 && lp < rp) {
984
pmb[lp] = pmb[rp];
980
- if (pmb[rp]->wsd) {
981
- free(pmb[rp]->wsd->string);
982
- FREE_AND_NULL(pmb[rp]->wsd);
983
- }
985
pmb[rp] = NULL;
986
rp--;
987
lp++;