From 23b65f9528a1fa19619d1dcb59932cc55075808c Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Fri, 11 Aug 2017 15:49:14 -0700 Subject: [PATCH] diff: avoid redundantly clearing a flag No code in diff.c sets DIFF_SYMBOL_MOVED_LINE except in mark_color_as_moved(), so it is redundant to clear it for the current line. Therefore, clear it only for previous lines. This makes a refactoring in a subsequent patch easier. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 4af73a7e0c..23311f9c00 100644 --- a/diff.c +++ b/diff.c @@ -898,7 +898,7 @@ static void mark_color_as_moved(struct diff_options *o, if (!match) { if (block_length < COLOR_MOVED_MIN_BLOCK_LENGTH && o->color_moved != COLOR_MOVED_PLAIN) { - for (i = 0; i < block_length + 1; i++) { + for (i = 1; i < block_length + 1; i++) { l = &o->emitted_symbols->buf[n - i]; l->flags &= ~DIFF_SYMBOL_MOVED_LINE; } -- 2.43.2