Merge branch 'jc/cc-stat' into next

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

diff --git a/revision.c b/revision.c
index 113dd5a89fc03ff17b04443f2ac7148b4c36af33..f9c7d15f56ded660e8cc58ca533786fff16c5429 100644 (file)
--- 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;