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>

Björn Steinbrink committed Jan 20, 2011 at 21:12 UTC 25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58

1 file changed +1 -1

sha1_file.c

+1 -1

@@ -2141,7 +2141,7 @@ void *read_sha1_file_repl(const unsigned char *sha1,

2141 return data;

2142 }

2143

2144 - if (errno != ENOENT)

2144 + if (errno && errno != ENOENT)

2145 die_errno("failed to read object %s", sha1_to_hex(sha1));

2146

2147 /* die if we replaced an object with one that does not exist */