X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diff-tree.c;h=e7a5b7cc76f5d80e602184f1ef12f502d53a552b;hb=40469ee9c6a6f4c85df5520ef719bba3d38a64f0;hp=cbea28d6ead4c237a6dc40ee63c0c856d5f3554b;hpb=3ebfd4aa29e30187ad7a3f75fa2d2971878468e7;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index cbea28d6..e7a5b7cc 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -238,10 +238,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 	unsigned long size1, size2;
 	int retval;
 
-	tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
+	tree1 = read_object_with_reference(old, "tree", &size1, 0);
 	if (!tree1)
 		die("unable to read source tree (%s)", sha1_to_hex(old));
-	tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
+	tree2 = read_object_with_reference(new, "tree", &size2, 0);
 	if (!tree2)
 		die("unable to read destination tree (%s)", sha1_to_hex(new));
 	retval = diff_tree(tree1, size1, tree2, size2, base);
@@ -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")) {