X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit-tree.c;h=bad72e89e8d83360f75c6f260d2b358fd7f2bf36;hb=c39c4f4746ba4543b532594543d252e2bad62234;hp=e91af4bd36a04d07dd00b124e63f2ab085de69df;hpb=3496277a561307c3d31d2085347af8eb4c667c36;p=git.git diff --git a/commit-tree.c b/commit-tree.c index e91af4bd..bad72e89 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -45,14 +45,13 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...) static void check_valid(unsigned char *sha1, const char *expect) { - void *buf; char type[20]; - unsigned long size; - buf = read_sha1_file(sha1, type, &size); - if (!buf || strcmp(type, expect)) - die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect); - free(buf); + if (sha1_object_info(sha1, type, NULL)) + die("%s is not a valid object", sha1_to_hex(sha1)); + if (expect && strcmp(type, expect)) + die("%s is not a valid '%s' object", sha1_to_hex(sha1), + expect); } /*