git-fetch --upload-pack: disambiguate.

diff --git a/ls-tree.c b/ls-tree.c
index a2a5eb0514ad6a0af942f1089f35fe9c45dd82ff..d005643ee08e03be2309c02e72522c6a81e8a1c6 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -12,11 +12,14 @@ 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 int chomp_prefix = 0;
+static const char *prefix;
 
 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] [--full-name] <tree-ish> [path...]";
 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {
@@ -48,7 +51,8 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
        }
 }
 
-static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
+static int show_tree(unsigned char *sha1, const char *base, int baselen,
+                    const char *pathname, unsigned mode, int stage)
 {
        int retval = 0;
        const char *type = "blob";
@@ -61,21 +65,30 @@ 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;
+
+       if (chomp_prefix &&
+           (baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
+               return 0;
 
-       printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
-       write_name_quoted(base, baselen, pathname, line_termination, stdout);
+       if (!(ls_options & LS_NAME_ONLY))
+               printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+       write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
+                         pathname,
+                         line_termination, stdout);
        putchar(line_termination);
        return retval;
 }
 
 int main(int argc, const char **argv)
 {
-       const char *prefix;
        unsigned char sha1[20];
-       char *buf;
-       unsigned long size;
+       struct tree *tree;
 
        prefix = setup_git_directory();
+       if (prefix && *prefix)
+               chomp_prefix = strlen(prefix);
        while (1 < argc && argv[1][0] == '-') {
                switch (argv[1][1]) {
                case 'z':
@@ -90,11 +103,26 @@ 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;
+                       }
+                       if (!strcmp(argv[1]+2, "full-name")) {
+                               chomp_prefix = 0;
+                               break;
+                       }
+                       /* otherwise fallthru */
                default:
                        usage(ls_tree_usage);
                }
                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);
@@ -102,10 +130,10 @@ int main(int argc, const char **argv)
                usage(ls_tree_usage);
 
        pathspec = get_pathspec(prefix, argv + 2);
-       buf = read_object_with_reference(sha1, "tree", &size, NULL);
-       if (!buf)
+       tree = parse_tree_indirect(sha1);
+       if (!tree)
                die("not a tree object");
-       read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
+       read_tree_recursive(tree, "", 0, 0, pathspec, show_tree);
 
        return 0;
 }