From: Junio C Hamano Date: Sat, 26 Nov 2005 09:57:09 GMT Subject: [PATCH 6/8] ls-tree: work from subdirectory. Message-ID: <7vpson4tqi.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vmzjtn3h1.fsf@assigned-by-dhcp.cox.net> This makes ls-tree to work from subdirectory. It defaults to show the paths under the current subdirectory, and interprets user-supplied paths as relative to the current subdirectory. Signed-off-by: Junio C Hamano --- ls-tree.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) applies-to: 4e55e4796ee699c9361b3751a36a85ba282119a8 40af60bb52cd86e1f089eeb89b2d3d79531c55d1 diff --git a/ls-tree.c b/ls-tree.c index d9f15e3..ed546a5 100644 --- a/ls-tree.c +++ b/ls-tree.c @@ -8,6 +8,8 @@ #include "tree.h" #include "quote.h" +static const char *prefix; + static int line_termination = '\n'; #define LS_RECURSIVE 1 #define LS_TREE_ONLY 2 @@ -204,7 +206,7 @@ static int list_one(const char *path) return err; } -static int list(char **path) +static int list(const char **path) { 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] [path...]"; -int main(int argc, char **argv) +int main(int argc, const char **argv) { - static char *path0[] = { "", NULL }; - char **path; + static const char *path0[] = { "", NULL }; + const char **path; unsigned char sha1[20]; + int nongit = 0; + + prefix = setup_git_directory_gently(&nongit); + if (prefix) + path0[0] = prefix; 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); - 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"); --- 0.99.9.GIT