summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2011-01-20 20:12:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-20 21:18:51 (GMT)
commit25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58 (patch)
treedc2ec1e79f80cbf5389654912d22ddcb66d99c75 /sha1_file.c
parentb20e9b0b521a416b00a81d6c4788dfd2df25efc0 (diff)
downloadgit-25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58.zip
git-25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58.tar.gz
git-25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58.tar.bz2
Correctly report corrupted objects
The errno check added in commit 3ba7a06 "A loose object is not corrupt if it cannot be read due to EMFILE" only checked for whether errno is not ENOENT and thus incorrectly treated "no error" as an error condition. Because of that, it never reached the code path that would report that the object is corrupted and instead caused funny errors like: fatal: failed to read object 333c4768ce595793fdab1ef3a036413e2a883853: Success So we have to extend the check to cover the case in which the object file was successfully read, but its contents are corrupted. Reported-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 1cafdfa..d86a8db 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2141,7 +2141,7 @@ void *read_sha1_file_repl(const unsigned char *sha1,
return data;
}
- if (errno != ENOENT)
+ if (errno && 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 */