Merge branch 'jk/has-sha1-file-retry-packed' into maint

* jk/has-sha1-file-retry-packed:
  has_sha1_file: re-check pack directory before giving up
This commit is contained in:
Junio C Hamano 2013-10-17 15:45:54 -07:00
commit 7d9dd6da4a

View file

@ -2925,7 +2925,10 @@ int has_sha1_file(const unsigned char *sha1)
if (find_pack_entry(sha1, &e))
return 1;
return has_loose_object(sha1);
if (has_loose_object(sha1))
return 1;
reprepare_packed_git();
return find_pack_entry(sha1, &e);
}
static void check_tree(const void *buf, size_t size)