X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;fp=commit-tree.c;h=0320036e802f820760dd197f745698acb5531bbb;hb=31fff305bcc6db3b8082eac7fc9e441b27964fea;hp=25958509703f7e46dc0b1a4bffd7be8ba2897cf9;hpb=afb4ff206967c6b3e481994cc6d0d86139792169;p=git.git diff --git a/commit-tree.c b/commit-tree.c index 25958509..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_hex(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++;