[PATCH] ls-tree: --name-only

[Junio C Hamano <junkio@cox.net>]

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 HEAD -- ..

would show only the paths but 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 <junkio@cox.net>

---

  Linus Torvalds <torvalds@osdl.org> writes:

  > That brings up another issue. I typed
  >
  > 	git-ls-tree -r --name-only ..
  >
  > and it obviously didn't work. That's kind of sad. I use that quite a lot 
  > for "git diff", for example, because quite often I want to see the files, 
  > but I don't care about anything else.

 ls-tree.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

c639a5548a5d8414b55202592885449f66ee2f33
diff --git a/ls-tree.c b/ls-tree.c
index 07db863..dae377d 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] <tree-ish> [path...]";
+	"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]";
 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {
@@ -64,7 +65,8 @@ static int show_tree(unsigned char *sha1
 	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);
 		}
-- 
0.99.9.GIT