diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 08:11:40 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 08:11:40 +0400 |
| commit | 35977f2316d68faa850222e19d4baec407511756 (patch) | |
| tree | e1ed285b4b8fd0cb891e0c0be25eb309cf39c4fa /log-tree.c | |
| parent | a4da3388fd83e4b31273d71bebf8a92becd8f60c (diff) | |
| parent | e2c59667ed0a495998b911628de5389a0ee9a728 (diff) | |
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 'log-tree.c')
| -rw-r--r-- | log-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index cea8756866..34c49e7b33 100644 --- a/log-tree.c +++ b/log-tree.c @@ -711,14 +711,15 @@ int log_tree_diff_flush(struct rev_info *opt) opt->verbose_header && opt->commit_format != CMIT_FMT_ONELINE) { int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; - if ((pch & opt->diffopt.output_format) == pch) - printf("---"); if (opt->diffopt.output_prefix) { struct strbuf *msg = NULL; msg = opt->diffopt.output_prefix(&opt->diffopt, opt->diffopt.output_prefix_data); fwrite(msg->buf, msg->len, 1, stdout); } + if ((pch & opt->diffopt.output_format) == pch) { + printf("---"); + } putchar('\n'); } } |