kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Linus Torvalds 2005-11-27 22:48:08 -08:00 committed by Junio C Hamano
parent b45c569b6f
commit e2466376ec
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ls-tree.c
View File

@ -11,7 +11,8 @@
static int line_termination = '\n';
#define LS_RECURSIVE 1
#define LS_TREE_ONLY 2
static int ls_options = LS_RECURSIVE;
static int ls_options = 0;
const char **pathspec;

static const char ls_tree_usage[] =
"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
const char *type = "blob";

if (S_ISDIR(mode)) {
const char **s;
if (ls_options & LS_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";
}

@ -32,7 +54,7 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen, const c

int main(int argc, const char **argv)
{
const char **path, *prefix;
const char *prefix;
unsigned char sha1[20];
char *buf;
unsigned long size;
@ -60,11 +82,11 @@ int main(int argc, const char **argv)
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;
}