summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 12:57:20 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-23 12:57:21 -0700
commit31a199a76e086f8931237b352ddcb7ba2b617481 (patch)
tree5b50cd44bc371037466a0df32fe4182fbb12e0e3 /log-tree.c
parentba8e6326f16748d67fbeda65ffde4729760c64f0 (diff)
parente2c59667ed0a495998b911628de5389a0ee9a728 (diff)
downloadgit-31a199a76e086f8931237b352ddcb7ba2b617481.tar.gz
Merge branch 'lp/maint-diff-three-dash-with-graph'
"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.c5
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');
}
}