From: Junio C Hamano Date: Thu, 01 Dec 2005 21:15:20 GMT Subject: Re: git-ls-tree: add "-t" option to always show the tree entries Message-ID: <7vlkz4friv.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > NOTE! This also means that it will show all trees leading up to that tree. ... which is logical but slightly unexpected. Also I noticed we lost '-d' but still accept it as an option, so... -- >8 -- [PATCH]: 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 --- * The practical value of this patch is dubious, and we might want to simply remove '-d' from the options. But the output from this looks kind-of nice. Thoughts? diff --git a/ls-tree.c b/ls-tree.c index a2a5eb0..07db863 100644 --- a/ls-tree.c +++ b/ls-tree.c @@ -61,6 +61,8 @@ static int show_tree(unsigned char *sha1 } 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);