X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=d1c61c8515cd531f1304b2b3cd0dea6a975c26c2;hb=b176e6ba5bc37466ffcb6c8c0f38c47ec6e9e73a;hp=2a088d11cfb69e21c8014c0c5d4a992ca1585c6c;hpb=b5b1442ac35706ce1e3daed407dd935f0e9dd796;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 2a088d11..d1c61c85 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -117,10 +117,7 @@ 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));
+	diff_tree_setup_paths(get_pathspec(prefix, argv), &opt->diffopt);
 	diff_setup_done(&opt->diffopt);
 
 	switch (nr_sha1) {