@matheusbsbs / matheus-bagliano / commits / e2466376ec
Fork 0

ls-tree: further tweaks of the rewrite

It modifies the selection a bit, so that a pathspec that is a superset of a particular tree path will always cause it to recurse into that tree. As an example, let's say that we do git-ls-tree HEAD drivers/char _without_ the "-r". What will happen is that it will start out doing all the base tree, and for "drivers" it will notice that it's a proper subset of "drivers/char", so it will always recurse into _that_ tree (but not into other trees). Then, it will not match anything else than "char" in that subdirectory, and because that's not a proper superset (it's an exact match), it will _not_ recurse into it, so you get: [torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char 040000 tree 9568cda453aae205bb58983747fa73b9696d9d51 drivers/char which is what you got with the old git-ls-tree too. But interestingly, if you add the slash, it will become a proper superset and it will recurse into _that_ subdirectory (but no deeper: so if you want all subdirectories _below_ drivers/char/, you still need to give "-r"): [torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char/ 100644 blob 2b6b1d772ed776fff87927fc34adc2e40500218e drivers/char/.gitignore 100644 blob 56b8a2e76ab10a5c21787cb7068a846075cbaffd drivers/char/ChangeLog 100644 blob 970f70d498f4c814e1cf3362e33d7e23ac53c299 drivers/char/Kconfig ... See? This is on top of the previous two diffs, holler if you want a whole new "everything combined" version.. It hasn't gotten lots of testing, but it should work. Linus

Linus Torvalds committed Nov 27, 2005 at 22:48 UTC e2466376ec9a8508b4c8ba2b0c29945c5bfc6cc2
1 file changed +26 -4
ls-tree.c
+26 -4
@@ -11,7 +11,8 @@
11 static int line_termination = '\n';
12 #define LS_RECURSIVE 1
13 #define LS_TREE_ONLY 2
14 -static int ls_options = LS_RECURSIVE;
14 +static int ls_options = 0;
15 +const char **pathspec;
16
17 static const char ls_tree_usage[] =
18 "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
@@ -21,8 +22,29 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c
22 const char *type = "blob";
23
24 if (S_ISDIR(mode)) {
25 + const char **s;
26 if (ls_options & LS_RECURSIVE)
27 return READ_TREE_RECURSIVE;
28 + s = pathspec;
29 + if (s) {
30 + for (;;) {
31 + const char *spec = *s++;
32 + int len, speclen;
33 +
34 + if (!spec)
35 + break;
36 + if (strncmp(base, spec, baselen))
37 + continue;
38 + len = strlen(pathname);
39 + spec += baselen;
40 + speclen = strlen(spec);
41 + if (speclen <= len)
42 + continue;
43 + if (memcmp(pathname, spec, len))
44 + continue;
45 + return READ_TREE_RECURSIVE;
46 + }
47 + }
48 type = "tree";
49 }
50
@@ -32,7 +54,7 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c
54
55 int main(int argc, const char **argv)
56 {
35 - const char **path, *prefix;
57 + const char *prefix;
58 unsigned char sha1[20];
59 char *buf;
60 unsigned long size;
@@ -60,11 +82,11 @@ int main(int argc, const char **argv)
82 if (get_sha1(argv[1], sha1) < 0)
83 usage(ls_tree_usage);
84
63 - path = get_pathspec(prefix, argv + 2);
85 + pathspec = get_pathspec(prefix, argv + 2);
86 buf = read_object_with_reference(sha1, "tree", &size, NULL);
87 if (!buf)
88 die("not a tree object");
67 - read_tree_recursive(buf, size, "", 0, 0, path, show_tree);
89 + read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
90
91 return 0;
92 }