mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
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>
This commit is contained in:
parent
c64b420b4c
commit
68abc6f1c7
1 changed files with 6 additions and 2 deletions
8
diff.c
8
diff.c
|
@ -561,6 +561,7 @@ static void emit_line(struct diff_options *o, const char *set, const char *reset
|
|||
}
|
||||
|
||||
enum diff_symbol {
|
||||
DIFF_SYMBOL_CONTEXT_FRAGINFO,
|
||||
DIFF_SYMBOL_CONTEXT_MARKER,
|
||||
DIFF_SYMBOL_SEPARATOR
|
||||
};
|
||||
|
@ -570,6 +571,9 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
|
|||
{
|
||||
const char *context, *reset;
|
||||
switch (s) {
|
||||
case DIFF_SYMBOL_CONTEXT_FRAGINFO:
|
||||
emit_line(o, "", "", line, len);
|
||||
break;
|
||||
case DIFF_SYMBOL_CONTEXT_MARKER:
|
||||
context = diff_get_color_opt(o, DIFF_CONTEXT);
|
||||
reset = diff_get_color_opt(o, DIFF_RESET);
|
||||
|
@ -705,8 +709,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
|
|||
|
||||
strbuf_add(&msgbuf, line + len, org_len - len);
|
||||
strbuf_complete_line(&msgbuf);
|
||||
|
||||
emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
|
||||
emit_diff_symbol(ecbdata->opt,
|
||||
DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len);
|
||||
strbuf_release(&msgbuf);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue