projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
[git.git]
/
ls-tree.c
diff --git
a/ls-tree.c
b/ls-tree.c
index
dae377d
..
d005643
100644
(file)
--- a/
ls-tree.c
+++ b/
ls-tree.c
@@
-15,9
+15,11
@@
static int line_termination = '\n';
#define LS_NAME_ONLY 8
static int ls_options = 0;
const char **pathspec;
#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[] =
static const char ls_tree_usage[] =
- "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <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)
{
static int show_recursive(const char *base, int baselen, const char *pathname)
{
@@
-49,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";
{
int retval = 0;
const char *type = "blob";
@@
-65,21
+68,27
@@
static int show_tree(unsigned char *sha1, const char *base, int baselen, const c
else if (ls_options & LS_TREE_ONLY)
return 0;
else if (ls_options & LS_TREE_ONLY)
return 0;
+ if (chomp_prefix &&
+ (baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
+ return 0;
+
if (!(ls_options & LS_NAME_ONLY))
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
if (!(ls_options & LS_NAME_ONLY))
printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
- write_name_quoted(base, baselen, pathname, line_termination, stdout);
+ 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)
{
putchar(line_termination);
return retval;
}
int main(int argc, const char **argv)
{
- const char *prefix;
unsigned char sha1[20];
unsigned char sha1[20];
- char *buf;
- unsigned long size;
+ struct tree *tree;
prefix = setup_git_directory();
prefix = setup_git_directory();
+ if (prefix && *prefix)
+ chomp_prefix = strlen(prefix);
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
case 'z':
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
case 'z':
@@
-100,6
+109,10
@@
int main(int argc, const char **argv)
ls_options |= LS_NAME_ONLY;
break;
}
ls_options |= LS_NAME_ONLY;
break;
}
+ if (!strcmp(argv[1]+2, "full-name")) {
+ chomp_prefix = 0;
+ break;
+ }
/* otherwise fallthru */
default:
usage(ls_tree_usage);
/* otherwise fallthru */
default:
usage(ls_tree_usage);
@@
-117,10
+130,10
@@
int main(int argc, const char **argv)
usage(ls_tree_usage);
pathspec = get_pathspec(prefix, argv + 2);
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");
die("not a tree object");
- read_tree_recursive(
buf, siz
e, "", 0, 0, pathspec, show_tree);
+ read_tree_recursive(
tre
e, "", 0, 0, pathspec, show_tree);
return 0;
}
return 0;
}