Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

diff --git a/diff-tree.c b/diff-tree.c
index 2a088d11cfb69e21c8014c0c5d4a992ca1585c6c..d1c61c8515cd531f1304b2b3cd0dea6a975c26c2 100644 (file)
--- 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) {