diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
The context marker use the exact same output pattern, so reuse it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jun 29, 2017 at 17:06 UTC
f2bb1218f1e559131887b5c981bc8d962b00d85a
1 file changed
+4
-2
diff.c
+4
-2
@@ -564,6 +564,7 @@ enum diff_symbol {
564
DIFF_SYMBOL_WORDS_PORCELAIN,
565
DIFF_SYMBOL_WORDS,
566
DIFF_SYMBOL_CONTEXT,
567
+ DIFF_SYMBOL_CONTEXT_INCOMPLETE,
568
DIFF_SYMBOL_PLUS,
569
DIFF_SYMBOL_MINUS,
570
DIFF_SYMBOL_NO_LF_EOF,
@@ -622,6 +623,7 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
623
case DIFF_SYMBOL_CONTEXT_FRAGINFO:
624
emit_line(o, "", "", line, len);
625
break;
626
+ case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
627
case DIFF_SYMBOL_CONTEXT_MARKER:
628
context = diff_get_color_opt(o, DIFF_CONTEXT);
629
reset = diff_get_color_opt(o, DIFF_RESET);
@@ -1448,8 +1450,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
1450
default:
1451
/* incomplete line at the end */
1452
ecbdata->lno_in_preimage++;
1451
- emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
1452
- reset, line, len);
1453
+ emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
1454
+ line, len, 0);
1455
break;
1456
}
1457
}