diff options
| author | Nick Edelen <sirnot@gmail.com> | 2009-06-13 17:06:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 17:06:09 -0700 |
| commit | df533f34a31890a43baaf00d03c0a7fa51886bc5 (patch) | |
| tree | f832d9f406698222e99629eabd588fa7c662a9bc /tree-diff.c | |
| parent | c97038d1cfbd98ea258086c417fe4f0c094596d3 (diff) | |
| download | git-df533f34a31890a43baaf00d03c0a7fa51886bc5.tar.gz | |
diff-tree -r -t: include added/removed directories in the output
We used to include only the modified and typechanged directories
in the ouptut, but for consistency's sake, we should also include
added and removed ones as well.
This makes the output more consistent, but it may break existing scripts
that expect to see the current output which has long been the established
behaviour.
Signed-off-by: Nick Edelen <sirnot@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 9f67af6c1f..c83a8da392 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -233,6 +233,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); |