X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-diff.c;h=0459e54d3d89a413330f52ab34662f51924b04ea;hb=529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19;hp=b05d0f43555d28f872fd5225e6773eeb636ef302;hpb=4258c212ca2c3674be4b7e00a19db705eee77a48;p=git.git

diff --git a/tree-diff.c b/tree-diff.c
index b05d0f435..0459e54d3 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -239,6 +239,12 @@ static void show_entry(struct diff_options *opt, const char *prefix, struct tree
 		if (!tree || type != OBJ_TREE)
 			die("corrupt tree sha %s", sha1_to_hex(sha1));
 
+		if (DIFF_OPT_TST(opt, TREE_IN_RECURSIVE)) {
+			newbase[baselen + pathlen] = 0;
+			opt->add_remove(opt, *prefix, mode, sha1, newbase);
+			newbase[baselen + pathlen] = '/';
+		}
+
 		init_tree_desc(&inner, tree, size);
 		show_tree(opt, prefix, &inner, newbase, baselen + 1 + pathlen);
 
@@ -374,7 +380,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
 	}
 
 	/*
-	 * Then, discard all the non-relevane file pairs...
+	 * Then, discard all the non-relevant file pairs...
 	 */
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];