projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hash-object.c: type-fix to squelch compiler warnings.
[git.git]
/
ls-tree.c
diff --git
a/ls-tree.c
b/ls-tree.c
index
d9f15e3
..
cf4223f
100644
(file)
--- a/
ls-tree.c
+++ b/
ls-tree.c
@@
-157,9
+157,11
@@
static int show_entry(struct tree_entry_list *e, int level, char *pathbuf)
int err = 0;
if (e != &root_entry) {
int err = 0;
if (e != &root_entry) {
+ int pathlen = strlen(pathbuf);
printf("%06o %s %s ",
e->mode, entry_type(e), entry_hex(e));
printf("%06o %s %s ",
e->mode, entry_type(e), entry_hex(e));
- write_name_quoted(pathbuf, e->name, line_termination, stdout);
+ write_name_quoted(pathbuf, pathlen, e->name,
+ line_termination, stdout);
putchar(line_termination);
}
putchar(line_termination);
}
@@
-204,7
+206,7
@@
static int list_one(const char *path)
return err;
}
return err;
}
-static int list(char **path)
+static int list(c
onst c
har **path)
{
int i;
int err = 0;
{
int i;
int err = 0;
@@
-216,11
+218,16
@@
static int list(char **path)
static const char ls_tree_usage[] =
"git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
static const char ls_tree_usage[] =
"git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
-int main(int argc, char **argv)
+int main(int argc, c
onst c
har **argv)
{
{
- static char *path0[] = { "", NULL };
- char **path;
+ static c
onst c
har *path0[] = { "", NULL };
+ c
onst c
har **path;
unsigned char sha1[20];
unsigned char sha1[20];
+ int nongit = 0;
+ const char *prefix = setup_git_directory_gently(&nongit);
+
+ if (prefix)
+ path0[0] = prefix;
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
@@
-244,7
+251,11
@@
int main(int argc, char **argv)
if (get_sha1(argv[1], sha1) < 0)
usage(ls_tree_usage);
if (get_sha1(argv[1], sha1) < 0)
usage(ls_tree_usage);
- path = (argc == 2) ? path0 : (argv + 2);
+ if (argc == 2)
+ path = path0;
+ else
+ path = get_pathspec(prefix, argv + 2);
+
prepare_root(sha1);
if (list(path) < 0)
die("list failed");
prepare_root(sha1);
if (list(path) < 0)
die("list failed");