Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-28 22:13:06 +0400
committerJunio C Hamano <gitster@pobox.com>2010-11-03 19:24:57 +0300
commit3ba7a065527a27f45659398e882feaa1165cbb4c (patch)
treebc4ca96b86d9bae83cd255983f89bde607ecbb79 /sha1_file.c
parentb6c4ceccb3d6026c612fa55865c51374b26eb176 (diff)
A loose object is not corrupt if it cannot be read due to EMFILE
"git fsck" bails out with a claim that a loose object that cannot be read but exists on the filesystem to be corrupt, which is wrong when read_object() failed due to e.g. EMFILE. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 42517987a8..25f6965294 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2090,16 +2090,21 @@ void *read_sha1_file_repl(const unsigned char *sha1,
const unsigned char **replacement)
{
const unsigned char *repl = lookup_replace_object(sha1);
- void *data = read_object(repl, type, size);
+ void *data;
char *path;
const struct packed_git *p;
+ errno = 0;
+ data = read_object(repl, type, size);
if (data) {
if (replacement)
*replacement = repl;
return data;
}
+ if (errno != ENOENT)
+ die_errno("failed to read object %s", sha1_to_hex(sha1));
+
/* die if we replaced an object with one that does not exist */
if (repl != sha1)
die("replacement %s not found for %s",