@matheusbsbs / matheus-bagliano / commits / 2034b473e1

diff --color-moved-ws: fix false positives

'diff --color-moved-ws=allow-indentation-change' can color lines as moved when they are in fact different. For example in commit 1a07e59c3e ("Update messages in preparation for i18n", 2018-07-21) the lines - die (_("must end with a color")); + die(_("must end with a color")); are colored as moved even though they are different. This is because if there is a fuzzy match for the first line of a potential moved block the line is marked as moved before the potential match is checked to see if it actually matches. The fix is to delay marking the line as moved until after we have checked that there really is at least one matching potential moved block. Note that the test modified in the last commit still fails because adding an unmoved line between two moved blocks that are already separated by unmoved lines changes the color of the block following the addition. This should not be the case and will be fixed in the next commit. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Phillip Wood committed Nov 23, 2018 at 11:16 UTC 2034b473e1316d206c39be67dcb3f71fa93c06f5

1 file changed +9 -6

diff.c

+9 -6

@@ -1106,10 +1106,10 @@ static void mark_color_as_moved(struct diff_options *o,

1106 continue;

1107 }

1108

1109 - l->flags |= DIFF_SYMBOL_MOVED_LINE;

1110 -

1111 - if (o->color_moved == COLOR_MOVED_PLAIN)

1109 + if (o->color_moved == COLOR_MOVED_PLAIN) {

1110 + l->flags |= DIFF_SYMBOL_MOVED_LINE;

1111 continue;

1112 + }

1113

1114 if (o->color_moved_ws_handling &

1115 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)

@@ -1143,10 +1143,13 @@ static void mark_color_as_moved(struct diff_options *o,

1143 block_length = 0;

1144 }

1145

1146 - block_length++;

1146 + if (pmb_nr) {

1147 + block_length++;

1148

1148 - if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)

1149 - l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;

1149 + l->flags |= DIFF_SYMBOL_MOVED_LINE;

1150 + if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)

1151 + l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;

1152 + }

1153 }

1154 adjust_last_block(o, n, block_length);

1155