summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 11:35:01 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 11:35:02 -0700
commite7cc0ede1837b6f679e245e29ae3687fc5e6c20d (patch)
treef20fa96fad6afd13fd97cd895bdbc7e173a3c29e /combine-diff.c
parent7e03f416633b5dbd242d6552e239d50a821262c6 (diff)
parentad2f7255b3e93dacd0982a946d30f6595dd8a805 (diff)
downloadgit-e7cc0ede1837b6f679e245e29ae3687fc5e6c20d.tar.gz
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
* mk/show-s-no-extra-blank-line-for-merges: git-show: fix 'git show -s' to not add extra terminator after merge commit
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 12764fb733..f9975d2c2e 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1396,7 +1396,8 @@ void diff_tree_combined(const unsigned char *sha1,
if (show_log_first) {
show_log(rev);
- if (rev->verbose_header && opt->output_format)
+ if (rev->verbose_header && opt->output_format &&
+ opt->output_format != DIFF_FORMAT_NO_OUTPUT)
printf("%s%c", diff_line_prefix(opt),
opt->line_termination);
}