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 /combine-diff.c | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| parent | b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95 (diff) | |
| download | git-723361a572e8c9fe93f00b17a1f4ed02585923b2.tar.gz | |
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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
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); } |