#define LS_RECURSIVE 1
#define LS_TREE_ONLY 2
static int ls_options = 0;
+const char **pathspec;
static const char ls_tree_usage[] =
"git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
{
const char *type = "blob";
- int retval = 0;
if (S_ISDIR(mode)) {
- type = "tree";
+ const char **s;
if (ls_options & LS_RECURSIVE)
- retval = READ_TREE_RECURSIVE;
+ return READ_TREE_RECURSIVE;
+ s = pathspec;
+ if (s) {
+ for (;;) {
+ const char *spec = *s++;
+ int len, speclen;
+
+ if (!spec)
+ break;
+ if (strncmp(base, spec, baselen))
+ continue;
+ len = strlen(pathname);
+ spec += baselen;
+ speclen = strlen(spec);
+ if (speclen <= len)
+ continue;
+ if (memcmp(pathname, spec, len))
+ continue;
+ return READ_TREE_RECURSIVE;
+ }
+ }
+ type = "tree";
}
- printf("%06o %s %s\t%.*s%s%c", mode, type, sha1_to_hex(sha1), baselen, base, pathname, line_termination);
- return retval;
+ printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+ write_name_quoted(base, baselen, pathname, line_termination, stdout);
+ putchar(line_termination);
+ return 0;
}
int main(int argc, const char **argv)
{
- const char **path, *prefix;
+ const char *prefix;
unsigned char sha1[20];
char *buf;
unsigned long size;
if (get_sha1(argv[1], sha1) < 0)
usage(ls_tree_usage);
- path = get_pathspec(prefix, argv + 2);
+ pathspec = get_pathspec(prefix, argv + 2);
buf = read_object_with_reference(sha1, "tree", &size, NULL);
if (!buf)
die("not a tree object");
- read_tree_recursive(buf, size, "", 0, 0, path, show_tree);
+ read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
return 0;
}