sha1_file: freshen pack objects before loose
When writing out an object file, we first check whether it already exists and if so optimize out the write. Prior to 33d4221, we did this by calling has_sha1_file(), which will check for packed objects followed by loose. Since that commit, we check loose objects first. For the common case of a repository whose objects are mostly packed, this means we will make a lot of extra access() system calls checking for loose objects. We should follow the same packed-then-loose order that all of our other lookups use. Reported-by: Stefan Saasen <ssaasen@atlassian.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Apr 20, 2015 at 15:54 UTC
b5f52f372e85c6e461b6123cd7eebd544b439020
1 file changed
+1
-1
sha1_file.c
+1
-1
@@ -3014,7 +3014,7 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign
3014
write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
3015
if (returnsha1)
3016
hashcpy(returnsha1, sha1);
3017
- if (freshen_loose_object(sha1) || freshen_packed_object(sha1))
3017
+ if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
3018
return 0;
3019
return write_loose_object(sha1, hdr, hdrlen, buf, len, 0);
3020
}