X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-tree.c;h=f2b3bc1231b7fdfd7277974fc5a5708ceef9cbaf;hb=refs%2Fheads%2Fmaint;hp=97f09bdf81c9e665d392990d70714e40357036d1;hpb=c534c4ba7e01cc77e1470b91d1b090289410971b;p=git.git

diff --git a/ls-tree.c b/ls-tree.c
index 97f09bdf..f2b3bc12 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -56,7 +56,7 @@ 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";
+	const char *type = blob_type;
 
 	if (S_ISDIR(mode)) {
 		if (show_recursive(base, baselen, pathname)) {
@@ -64,7 +64,7 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen,
 			if (!(ls_options & LS_SHOW_TREES))
 				return retval;
 		}
-		type = "tree";
+		type = tree_type;
 	}
 	else if (ls_options & LS_TREE_ONLY)
 		return 0;
@@ -90,6 +90,7 @@ int main(int argc, const char **argv)
 	struct tree *tree;
 
 	prefix = setup_git_directory();
+	git_config(git_default_config);
 	if (prefix && *prefix)
 		chomp_prefix = strlen(prefix);
 	while (1 < argc && argv[1][0] == '-') {
@@ -141,8 +142,8 @@ int main(int argc, const char **argv)
 
 	if (argc < 2)
 		usage(ls_tree_usage);
-	if (get_sha1(argv[1], sha1) < 0)
-		usage(ls_tree_usage);
+	if (get_sha1(argv[1], sha1))
+		die("Not a valid object name %s", argv[1]);
 
 	pathspec = get_pathspec(prefix, argv + 2);
 	tree = parse_tree_indirect(sha1);