X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=0320036e802f820760dd197f745698acb5531bbb;hb=d3d8f361a8c6beb5647e0d963a1460a505324494;hp=bad72e89e8d83360f75c6f260d2b358fd7f2bf36;hpb=935e714204fe167aa6172a733e7131ee5b4577f4;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index bad72e89..0320036e 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -91,15 +91,19 @@ int main(int argc, char **argv)
 
 	git_config(git_default_config);
 
-	if (argc < 2 || get_sha1(argv[1], tree_sha1) < 0)
+	if (argc < 2)
 		usage(commit_tree_usage);
+	if (get_sha1(argv[1], tree_sha1))
+		die("Not a valid object name %s", argv[1]);
 
 	check_valid(tree_sha1, tree_type);
 	for (i = 2; i < argc; i += 2) {
 		char *a, *b;
 		a = argv[i]; b = argv[i+1];
-		if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
+		if (!b || strcmp(a, "-p"))
 			usage(commit_tree_usage);
+		if (get_sha1(b, parent_sha1[parents]))
+			die("Not a valid object name %s", b);
 		check_valid(parent_sha1[parents], commit_type);
 		if (new_parent(parents))
 			parents++;