From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:35:01 +0000 (-0700)
Subject: Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
X-Git-Tag: v2.1.0-rc0~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7cc0ede1837b6f679e245e29ae3687fc5e6c20d

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
---

e7cc0ede1837b6f679e245e29ae3687fc5e6c20d
diff --cc combine-diff.c
index 12764fb733,ff6ceafe61..f9975d2c2e
--- a/combine-diff.c
+++ b/combine-diff.c
@@@ -1383,23 -1302,8 +1383,24 @@@ void diff_tree_combined(const unsigned 
  {
  	struct diff_options *opt = &rev->diffopt;
  	struct diff_options diffopts;
 -	struct combine_diff_path *p, *paths = NULL;
 +	struct combine_diff_path *p, *paths;
  	int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
 +	int need_generic_pathscan;
 +
 +	/* nothing to do, if no parents */
 +	if (!num_parent)
 +		return;
 +
 +	show_log_first = !!rev->loginfo && !rev->no_commit_id;
 +	needsep = 0;
 +	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);
 +	}
  
  	diffopts = *opt;
  	copy_pathspec(&diffopts.pathspec, &opt->pathspec);