Merge branch 'jc/cc-stat'

Junio C Hamano · Junio C Hamano · commit 2effe71b7c3a · 2006-04-24T02:06:40.000-07:00
* jc/cc-stat:
  Fix "git show --stat"
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,8 @@ int setup_revisions(int argc, const char *argv, struct rev_info revs, const ch`
`789`	`789`	`}`
`790`	`790`	`if (revs->combine_merges) {`
`791`	`791`	`revs->ignore_merges = 0;`
`792`		`- if (revs->dense_combined_merges)`
	`792`	`+ if (revs->dense_combined_merges &&`
	`793`	`+ (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))`
`793`	`794`	`revs->diffopt.output_format = DIFF_FORMAT_PATCH;`
`794`	`795`	`}`
`795`	`796`	`revs->diffopt.abbrev = revs->abbrev;`