From c639a5548a5d8414b55202592885449f66ee2f33 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 1 Dec 2005 14:54:00 -0800 Subject: [PATCH] ls-tree: --name-only Fingers of some "git diff" users are trained to do --name-only which git-ls-tree unfortunately does not take. With this, cd sub/directory && git-ls-tree -r --name-only .. would show only the names not object names nor modes. I threw in another synonym --name-status only for usability, but obviously ls-tree does not do any comparison so what it does is the same as --name-only. Signed-off-by: Junio C Hamano --- ls-tree.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ls-tree.c b/ls-tree.c index 07db863bb..dae377d99 100644 --- a/ls-tree.c +++ b/ls-tree.c @@ -12,11 +12,12 @@ static int line_termination = '\n'; #define LS_RECURSIVE 1 #define LS_TREE_ONLY 2 #define LS_SHOW_TREES 4 +#define LS_NAME_ONLY 8 static int ls_options = 0; const char **pathspec; static const char ls_tree_usage[] = - "git-ls-tree [-d] [-r] [-t] [-z] [path...]"; + "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [path...]"; static int show_recursive(const char *base, int baselen, const char *pathname) { @@ -64,7 +65,8 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c else if (ls_options & LS_TREE_ONLY) return 0; - printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1)); + if (!(ls_options & LS_NAME_ONLY)) + printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1)); write_name_quoted(base, baselen, pathname, line_termination, stdout); putchar(line_termination); return retval; @@ -92,6 +94,13 @@ int main(int argc, const char **argv) case 't': ls_options |= LS_SHOW_TREES; break; + case '-': + if (!strcmp(argv[1]+2, "name-only") || + !strcmp(argv[1]+2, "name-status")) { + ls_options |= LS_NAME_ONLY; + break; + } + /* otherwise fallthru */ default: usage(ls_tree_usage); } -- 2.26.2