@matheusbsbs / matheus-bagliano / commits / 96ab4f4e7a
Fork 0

Fix "git show --stat"

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

Junio C Hamano committed Apr 21, 2006 at 19:39 UTC 96ab4f4e7a0fac1992a1f27ad2dc1106db09a5de
1 file changed +2 -1
revision.c
+2 -1
@@ -789,7 +789,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
789 }
790 if (revs->combine_merges) {
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))
794 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
795 }
796 revs->diffopt.abbrev = revs->abbrev;