From: Junio C Hamano <junkio@cox.net>
Date: Tue, 18 Apr 2006 18:41:28 +0000 (-0700)
Subject: Fix "git log --stat": make sure to set recursive with --stat.
X-Git-Tag: v1.4.0-rc1~239^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a624b346db02a07b0317743b362d1a15c6c3c18;p=git.git

Fix "git log --stat": make sure to set recursive with --stat.

Just like "patch" format always needs recursive, "diffstat"
format does not make sense without setting recursive.

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

diff --git a/diff.c b/diff.c
index b54bbfa62..d75e0178f 100644
--- a/diff.c
+++ b/diff.c
@@ -1029,6 +1029,15 @@ int diff_setup_done(struct diff_options *options)
 	     options->detect_rename != DIFF_DETECT_COPY) ||
 	    (0 <= options->rename_limit && !options->detect_rename))
 		return -1;
+
+	/*
+	 * These cases always need recursive; we do not drop caller-supplied
+	 * recursive bits for other formats here.
+	 */
+	if ((options->output_format == DIFF_FORMAT_PATCH) ||
+	    (options->output_format == DIFF_FORMAT_DIFFSTAT))
+		options->recursive = 1;
+
 	if (options->detect_rename && options->rename_limit < 0)
 		options->rename_limit = diff_rename_limit_default;
 	if (options->setup & DIFF_SETUP_USE_CACHE) {
diff --git a/revision.c b/revision.c
index 5abec18bc..4d2a64ef6 100644
--- a/revision.c
+++ b/revision.c
@@ -791,8 +791,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 		if (revs->dense_combined_merges)
 			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 	}
-	if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
-		revs->diffopt.recursive = 1;
 	revs->diffopt.abbrev = revs->abbrev;
 	diff_setup_done(&revs->diffopt);