Merge branch 'jk/has-sha1-file-retry-packed'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:41:34 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:41:35 +0000 (11:41 -0700)
When an object is not found after checking the packfiles and then
loose object directory, read_sha1_file() re-checks the packfiles to
prevent racing with a concurrent repacker; teach the same logic to
has_sha1_file().

* jk/has-sha1-file-retry-packed:
has_sha1_file: re-check pack directory before giving up

1  2 
sha1_file.c
diff --cc sha1_file.c
Simple merge