From: Junio C Hamano <junkio@cox.net>
Date: Mon, 24 Apr 2006 09:06:40 +0000 (-0700)
Subject: Merge branch 'jc/cc-stat'
X-Git-Tag: v1.4.0-rc1~221
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/2effe71b7c3a78cd20070752e04fb04830e4dd36?hp=cdb63506a0d632b4bf81378756b53f30d7198b50

Merge branch 'jc/cc-stat'

* jc/cc-stat:
Fix "git show --stat"
---

diff --git a/revision.c b/revision.c
index 113dd5a89f..f9c7d15f56 100644
--- a/revision.c
+++ b/revision.c
@@ -789,7 +789,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 	}
 	if (revs->combine_merges) {
 		revs->ignore_merges = 0;
-		if (revs->dense_combined_merges)
+		if (revs->dense_combined_merges &&
+		    (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
 			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 	}
 	revs->diffopt.abbrev = revs->abbrev;