diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:10:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:10:55 -0700 |
| commit | 46c8f859b7eebe962d99c8547b0c908bbf8ecf0f (patch) | |
| tree | 4e1f3da2994cc1f18fbe8734a208315a02cc1114 /builtin | |
| parent | 102edda4dfa3f2119119c2b52c90a9337a03178f (diff) | |
| parent | 30d1038d1bd538bf2f8abfb5f5dccf80327a26c9 (diff) | |
| download | git-46c8f859b7eebe962d99c8547b0c908bbf8ecf0f.tar.gz | |
Merge branch 'jk/fsck-exit-code-fix' into maint
"git fsck" failed to report that it found corrupt objects via its
exit status in some cases.
* jk/fsck-exit-code-fix:
fsck: return non-zero status on missing ref tips
fsck: exit with non-zero status upon error from fsck_obj()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fsck.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index d42a27da89..0928a98a71 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -388,7 +388,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; @@ -488,6 +489,7 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f obj = parse_object(sha1); if (!obj) { error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1)); + errors_found |= ERROR_REACHABLE; /* We'll continue with the rest despite the error.. */ return 0; } @@ -504,7 +506,7 @@ static void get_default_heads(void) { if (head_points_at && !is_null_sha1(head_sha1)) fsck_handle_ref("HEAD", head_sha1, 0, NULL); - for_each_ref(fsck_handle_ref, NULL); + for_each_rawref(fsck_handle_ref, NULL); if (include_reflogs) for_each_reflog(fsck_handle_reflog, NULL); |