From: Junio C Hamano <junkio@cox.net>
Date: Sat, 26 Nov 2005 08:40:50 +0000 (-0800)
Subject: ls-tree: work from subdirectory.
X-Git-Tag: v0.99.9l^2~23^2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b191fa72ea501c0789fb1bd7a80fcec9da38804d;p=git.git

ls-tree: work from subdirectory.

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 <junkio@cox.net>
---

diff --git a/ls-tree.c b/ls-tree.c
index d7c7e750f..cf4223f4b 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -206,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;
@@ -218,11 +218,16 @@ static int list(char **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, const char **argv)
 {
-	static char *path0[] = { "", NULL };
-	char **path;
+	static const char *path0[] = { "", NULL };
+	const char **path;
 	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]) {
@@ -246,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");