From: Junio C Hamano <junkio@cox.net>
Date: Sat, 22 Apr 2006 02:39:04 +0000 (-0700)
Subject: Fix "git show --stat"
X-Git-Tag: v1.4.0-rc1~221^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de;p=git.git

Fix "git show --stat"

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/revision.c b/revision.c
index 113dd5a89..f9c7d15f5 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;