diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:54 -0700 |
| commit | 7d9dd6da4a02d26b6841b67f6b1a8c5773114d3e (patch) | |
| tree | 4c68c8c02b4784b8eed8c1412c96e41183715481 | |
| parent | 87b24a42eae8f33ccf28d0babbe91f0262feb7dc (diff) | |
| parent | 45e8a7487339c0f0ea28244ef06851308d07387c (diff) | |
| download | git-7d9dd6da4a02d26b6841b67f6b1a8c5773114d3e.tar.gz | |
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
| -rw-r--r-- | sha1_file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 8e27db1bd2..06784fb95a 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -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) |