Junio C Hamano  committed c639a55

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

  • Participants
  • Parent commits f598467
  • Branches master

Comments (0)

Files changed (1)

 #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)
 	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);
 	return retval;
 		case 't':
 			ls_options |= LS_SHOW_TREES;
+		case '-':
+			if (!strcmp(argv[1]+2, "name-only") ||
+			    !strcmp(argv[1]+2, "name-status")) {
+				ls_options |= LS_NAME_ONLY;
+				break;
+			}
+			/* otherwise fallthru */