summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-08-29 16:31:46 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-10 09:40:53 -0700
commit2e770fe47ef9c0b20bc687e37f3eb50f1bf919d0 (patch)
tree002f9ee6fb1a4262c9940e37830669da6fed9d70 /builtin
parentMerge branch 'maint-1.8.5' into maint-1.9 (diff)
downloadtgif-2e770fe47ef9c0b20bc687e37f3eb50f1bf919d0.tar.xz
fsck: exit with non-zero status upon error from fsck_obj()
Upon finding a corrupt loose object, we forgot to note the error to signal it with the exit status of the entire process. [jc: adjusted t1450 and added another test] Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fsck.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1affdd5e92..8abe6440bd 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -389,7 +389,8 @@ static void fsck_sha1_list(void)
unsigned char *sha1 = entry->sha1;
sha1_list.entry[i] = NULL;
- fsck_sha1(sha1);
+ if (fsck_sha1(sha1))
+ errors_found |= ERROR_OBJECT;
free(entry);
}
sha1_list.nr = 0;