diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:09 -0700 |
| commit | 723361a572e8c9fe93f00b17a1f4ed02585923b2 (patch) | |
| tree | 7479c011c8f1a008558b68c252733096b47aec11 /log-tree.c | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| parent | b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95 (diff) | |
Merge branch 'jk/pretty-empty-format' into maint
* jk/pretty-empty-format:
pretty: make empty userformats truly empty
pretty: treat "--format=" as an empty userformat
revision: drop useless string offset when parsing "--pretty"
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 0c53dc11ab..95e9b1da25 100644 --- a/log-tree.c +++ b/log-tree.c @@ -649,7 +649,7 @@ void show_log(struct rev_info *opt) graph_show_commit_msg(opt->graph, &msgbuf); else fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout); - if (opt->use_terminator) { + if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) { if (!opt->missing_newline) graph_show_padding(opt->graph); putchar(opt->diffopt.line_termination); @@ -676,7 +676,8 @@ int log_tree_diff_flush(struct rev_info *opt) show_log(opt); if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && opt->verbose_header && - opt->commit_format != CMIT_FMT_ONELINE) { + opt->commit_format != CMIT_FMT_ONELINE && + !commit_format_is_empty(opt->commit_format)) { /* * When showing a verbose header (i.e. log message), * and not in --pretty=oneline format, we would want |