diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:49:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:49:39 (GMT) |
| commit | 85785df6d6db50ff37d0ff1878c16ad69a063f6a (patch) | |
| tree | 795c85b0b9254583286d5cb08a43f33e63509e87 /combine-diff.c | |
| parent | d9036cd28c9b115fe38e2f629292f2ddf60fb805 (diff) | |
| parent | ad2f7255b3e93dacd0982a946d30f6595dd8a805 (diff) | |
| download | git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.zip git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.tar.gz git-85785df6d6db50ff37d0ff1878c16ad69a063f6a.tar.bz2 | |
Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
"git show -s" (i.e. show log message only) used to incorrectly emit
an extra blank line after a merge commit.
* 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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 24ca7e2..fd6d63c 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1339,7 +1339,8 @@ void diff_tree_combined(const unsigned char *sha1, if (show_log_first && i == 0) { 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); } |