summaryrefslogtreecommitdiff
path: root/ls-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-01 13:15:20 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-01 14:43:54 -0800
commitf59846718ed98e153c0423eaa5f7ff0526d2a6f8 (patch)
tree4837325c15f9a38b02ae6b3455720809c3405894 /ls-tree.c
parent0f8f45cb4a7e664b396f73c25891da46b953b8b8 (diff)
downloadgit-f59846718ed98e153c0423eaa5f7ff0526d2a6f8.tar.gz
ls-tree: resurrect '-d' to mean 'show trees only'
With this: git-ls-tree -d HEAD -- drivers/net/ shows only immediate subtrees of drivers/net. git-ls-tree -d -t HEAD -- drivers/net/ shows drivers, drivers/net and immediate subtrees of drivers/net. git-ls-tree -d -r HEAD -- drivers/net/ shows drivers, drivers/net and all subtrees of drivers/net (but not blobs). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ls-tree.c')
-rw-r--r--ls-tree.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ls-tree.c b/ls-tree.c
index a2a5eb0514..07db863bbc 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -61,6 +61,8 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c
}
type = "tree";
}
+ else if (ls_options & LS_TREE_ONLY)
+ return 0;
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
write_name_quoted(base, baselen, pathname, line_termination, stdout);
@@ -95,6 +97,10 @@ int main(int argc, const char **argv)
}
argc--; argv++;
}
+ /* -d -r should imply -t, but -d by itself should not have to. */
+ if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
+ ((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
+ ls_options |= LS_SHOW_TREES;
if (argc < 2)
usage(ls_tree_usage);