summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-02 13:25:03 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-02 13:25:04 -0700
commit44ceb79f84b0f339147d2d44e4bb50cc472be03e (patch)
tree207c1f0e269f9d99602ae9043ad6a259428a9831 /combine-diff.c
parent56f214e0716dec043b50a7e1e8cc181be2ef7df2 (diff)
parentb9c7d6e4330e3dcdb3b3e5f013e5667e47555c95 (diff)
downloadgit-44ceb79f84b0f339147d2d44e4bb50cc472be03e.tar.gz
Merge branch 'jk/pretty-empty-format'
"git log --pretty/format=" with an empty format string did not mean the more obvious "No output whatsoever" but "Use default format", which was counterintuitive. * 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 'combine-diff.c')
-rw-r--r--combine-diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 60cb4f81f9..91edce58e1 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1407,7 +1407,8 @@ void diff_tree_combined(const unsigned char *sha1,
show_log(rev);
if (rev->verbose_header && opt->output_format &&
- opt->output_format != DIFF_FORMAT_NO_OUTPUT)
+ opt->output_format != DIFF_FORMAT_NO_OUTPUT &&
+ !commit_format_is_empty(rev->commit_format))
printf("%s%c", diff_line_prefix(opt),
opt->line_termination);
}