diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
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
68abc6f1c744cd287423eb451925fe86d1230e12
1 file changed
+6
-2
diff.c
+6
-2
@@ -561,6 +561,7 @@ static void emit_line(struct diff_options *o, const char *set, const char *reset
561
}
562
563
enum diff_symbol {
564
+ DIFF_SYMBOL_CONTEXT_FRAGINFO,
565
DIFF_SYMBOL_CONTEXT_MARKER,
566
DIFF_SYMBOL_SEPARATOR
567
};
@@ -570,6 +571,9 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
571
{
572
const char *context, *reset;
573
switch (s) {
574
+ case DIFF_SYMBOL_CONTEXT_FRAGINFO:
575
+ emit_line(o, "", "", line, len);
576
+ break;
577
case DIFF_SYMBOL_CONTEXT_MARKER:
578
context = diff_get_color_opt(o, DIFF_CONTEXT);
579
reset = diff_get_color_opt(o, DIFF_RESET);
@@ -705,8 +709,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
709
710
strbuf_add(&msgbuf, line + len, org_len - len);
711
strbuf_complete_line(&msgbuf);
708
-
709
- emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
712
+ emit_diff_symbol(ecbdata->opt,
713
+ DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len);
714
strbuf_release(&msgbuf);
715
}
716