summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-02 02:40:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-02 02:40:47 (GMT)
commit4197195bee15f120e99d797b22108fd274235fd7 (patch)
treee5307d7a46959237ab60e43bf3131453855ba405 /tree-diff.c
parent3eb1e8ee1f968e9bb5ade30f17d1f49396b4c81c (diff)
parentdf533f34a31890a43baaf00d03c0a7fa51886bc5 (diff)
downloadgit-4197195bee15f120e99d797b22108fd274235fd7.zip
git-4197195bee15f120e99d797b22108fd274235fd7.tar.gz
git-4197195bee15f120e99d797b22108fd274235fd7.tar.bz2
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
* ne/maint-1.6.0-diff-tree-t-r-show-directory: diff-tree -r -t: include added/removed directories in the output
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-diff.c b/tree-diff.c
index edd8394..0459e54 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);