mirror of
https://github.com/git/git.git
synced 2025-04-03 16:51:10 +00:00
e2466376ec
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
93 lines
1.9 KiB
C
93 lines
1.9 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "blob.h"
|
|
#include "tree.h"
|
|
#include "quote.h"
|
|
|
|
static int line_termination = '\n';
|
|
#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";
|
|
|
|
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";
|
|
}
|
|
|
|
printf("%06o %s %s\t%.*s%s%c", mode, type, sha1_to_hex(sha1), baselen, base, pathname, line_termination);
|
|
return 0;
|
|
}
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
const char *prefix;
|
|
unsigned char sha1[20];
|
|
char *buf;
|
|
unsigned long size;
|
|
|
|
prefix = setup_git_directory();
|
|
while (1 < argc && argv[1][0] == '-') {
|
|
switch (argv[1][1]) {
|
|
case 'z':
|
|
line_termination = 0;
|
|
break;
|
|
case 'r':
|
|
ls_options |= LS_RECURSIVE;
|
|
break;
|
|
case 'd':
|
|
ls_options |= LS_TREE_ONLY;
|
|
break;
|
|
default:
|
|
usage(ls_tree_usage);
|
|
}
|
|
argc--; argv++;
|
|
}
|
|
|
|
if (argc < 2)
|
|
usage(ls_tree_usage);
|
|
if (get_sha1(argv[1], sha1) < 0)
|
|
usage(ls_tree_usage);
|
|
|
|
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, pathspec, show_tree);
|
|
|
|
return 0;
|
|
}
|