X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=write-tree.c;h=a794ea15b89ece14570bb8bf3ed0b42ab65cd413;hb=f13bbe7f56e49a11f6bfc3b73a463c741f969c9c;hp=b8bf8831e09facf19bfb9673e26a885ea249285a;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git diff --git a/write-tree.c b/write-tree.c index b8bf8831..a794ea15 100644 --- a/write-tree.c +++ b/write-tree.c @@ -7,14 +7,13 @@ static int check_valid_sha1(unsigned char *sha1) { - char *filename = sha1_file_name(sha1); int ret; /* If we were anal, we'd check that the sha1 of the contents actually matches */ - ret = access(filename, R_OK); - if (ret) - perror(filename); - return ret; + ret = has_sha1_file(sha1); + if (ret == 0) + perror(sha1_file_name(sha1)); + return ret ? 0 : -1; } static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)