diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-02 04:40:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 04:40:47 +0200 |
| commit | 4197195bee15f120e99d797b22108fd274235fd7 (patch) | |
| tree | e5307d7a46959237ab60e43bf3131453855ba405 /tree-diff.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | diff-tree -r -t: include added/removed directories in the output (diff) | |
| download | git-4197195bee15f120e99d797b22108fd274235fd7.tar.xz git-4197195bee15f120e99d797b22108fd274235fd7.zip | |
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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-diff.c b/tree-diff.c index edd83949bf..0459e54d3d 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); |