]> git.ipfire.org Git - thirdparty/git.git/commit
diff --color-moved: clear all flags on blocks that are too short
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Thu, 9 Dec 2021 10:29:56 +0000 (10:29 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2021 21:24:05 +0000 (13:24 -0800)
commitbea084ba41ffcaf5896522e48d67682b6a45b04c
treefc632d47cbe052a48edfa6671343a9286e8136f8
parentf73613ac33aad6f08aa1bc07e596202f19e760d1
diff --color-moved: clear all flags on blocks that are too short

If a block of potentially moved lines is not long enough then the
DIFF_SYMBOL_MOVED_LINE flag is cleared on the matching lines so they
are not marked as moved. To avoid problems when we start rewinding
after an unsuccessful match in a couple of commits time make sure all
the move related flags are cleared, not just DIFF_SYMBOL_MOVED_LINE.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c