[PATCH] diff-tree-helper: do not report unmerged path outside specification.

diff --git a/diff-tree.c b/diff-tree.c
index cbea28d6ead4c237a6dc40ee63c0c856d5f3554b..5a1ad34652fcda63a37c3aeb55c0231f1be69bdd 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
                        continue;
                }
                if (!strcmp(arg, "-p")) {
-                       generate_patch = 1;
+                       recursive = generate_patch = 1;
                        continue;
                }
                if (!strcmp(arg, "-z")) {