mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
bd033291d5
commit
30b7e1e7ef
1 changed files with 7 additions and 3 deletions
10
diff.c
10
diff.c
|
@ -571,6 +571,7 @@ enum diff_symbol {
|
|||
DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
|
||||
DIFF_SYMBOL_STATS_LINE,
|
||||
DIFF_SYMBOL_WORD_DIFF,
|
||||
DIFF_SYMBOL_STAT_SEP,
|
||||
DIFF_SYMBOL_SUBMODULE_ADD,
|
||||
DIFF_SYMBOL_SUBMODULE_DEL,
|
||||
DIFF_SYMBOL_SUBMODULE_UNTRACKED,
|
||||
|
@ -766,6 +767,9 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
|
|||
case DIFF_SYMBOL_WORD_DIFF:
|
||||
fprintf(o->file, "%.*s", len, line);
|
||||
break;
|
||||
case DIFF_SYMBOL_STAT_SEP:
|
||||
fputs(o->stat_sep, o->file);
|
||||
break;
|
||||
default:
|
||||
die("BUG: unknown diff symbol");
|
||||
}
|
||||
|
@ -5077,10 +5081,10 @@ void diff_flush(struct diff_options *options)
|
|||
if (output_format & DIFF_FORMAT_PATCH) {
|
||||
if (separator) {
|
||||
emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
|
||||
if (options->stat_sep) {
|
||||
if (options->stat_sep)
|
||||
/* attach patch instead of inline */
|
||||
fputs(options->stat_sep, options->file);
|
||||
}
|
||||
emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
|
||||
NULL, 0, 0);
|
||||
}
|
||||
|
||||
diff_flush_patch_all_file_pairs(options);
|
||||
|
|
Loading…
Reference in a new issue