summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2017-08-11 15:49:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-14 12:28:36 -0700
commit23b65f9528a1fa19619d1dcb59932cc55075808c (patch)
tree5d42d18cac9562aab3cedeb159221b0b1cbfd2c4
parentdiff: document the new --color-moved setting (diff)
downloadtgif-23b65f9528a1fa19619d1dcb59932cc55075808c.tar.xz
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 <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
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;
}