diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:40 -0700 |
| commit | 35977f2316d68faa850222e19d4baec407511756 (patch) | |
| tree | e1ed285b4b8fd0cb891e0c0be25eb309cf39c4fa /diff.c | |
| parent | Merge branch 'jk/rebase-i-submodule-conflict-only' into maint (diff) | |
| parent | t4202: add test for "log --graph --stat -p" separator lines (diff) | |
| download | tgif-35977f2316d68faa850222e19d4baec407511756.tar.xz | |
Merge branch 'lp/maint-diff-three-dash-with-graph' into maint
"log -p --graph" used with "--stat" had a few formatting error.
By Lucian Poston
* lp/maint-diff-three-dash-with-graph:
t4202: add test for "log --graph --stat -p" separator lines
log --graph: fix break in graph lines
log --graph --stat: three-dash separator should come after graph lines
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -4414,6 +4414,12 @@ void diff_flush(struct diff_options *options) if (output_format & DIFF_FORMAT_PATCH) { if (separator) { + if (options->output_prefix) { + struct strbuf *msg = NULL; + msg = options->output_prefix(options, + options->output_prefix_data); + fwrite(msg->buf, msg->len, 1, stdout); + } putc(options->line_termination, options->file); if (options->stat_sep) { /* attach patch instead of inline */ |