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
git-mirror · Oct 17, 2013 · 7d9dd6d · 7d9dd6d
2 parents 87b24a4 + 45e8a74
commit 7d9dd6d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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)