From: Junio C Hamano <junkio@cox.net>
Date: Tue, 18 Apr 2006 18:29:33 +0000 (-0700)
Subject: diff --stat: make sure to set recursive.
X-Git-Tag: v1.3.0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f56ef54174598d5362d0446c5a560cb5892537c2;p=git.git

diff --stat: make sure to set recursive.

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-tree.c b/diff-tree.c
index 7015b06c7..d1c61c851 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -117,9 +117,6 @@ int main(int argc, const char **argv)
 	if (opt->dense_combined_merges)
 		opt->diffopt.output_format = DIFF_FORMAT_PATCH;
 
-	if (opt->diffopt.output_format == DIFF_FORMAT_PATCH)
-		opt->diffopt.recursive = 1;
-
 	diff_tree_setup_paths(get_pathspec(prefix, argv), &opt->diffopt);
 	diff_setup_done(&opt->diffopt);
 
diff --git a/diff.c b/diff.c
index b54bbfa62..3a1e6ce61 100644
--- a/diff.c
+++ b/diff.c
@@ -1029,6 +1029,16 @@ 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->with_stat))
+		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/git.c b/git.c
index 140ed1873..5209b04de 100644
--- a/git.c
+++ b/git.c
@@ -344,8 +344,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
 			opt.ignore_merges = 0;
 		if (opt.dense_combined_merges)
 			opt.diffopt.output_format = DIFF_FORMAT_PATCH;
-		if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
-			opt.diffopt.recursive = 1;
 		if (!full_diff && rev.prune_data)
 			diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
 		diff_setup_done(&opt.diffopt);