fsck: exit with non-zero when problems are found

After finding some problems (e.g. a ref refs/heads/X points at an
object that is not a commit) and issuing an error message, the
program failed to signal the fact that it found an error by a
non-zero exit status.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 4e8e2ee5b739379e387c3875a1d71de8a22a6db6..63ab0bbb0c31e2ba3a6a08c5c78b84e290ebc128 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -35,6 +35,7 @@ static int show_dangling = 1;
 #define ERROR_OBJECT 01
 #define ERROR_REACHABLE 02
 #define ERROR_PACK 04
 #define ERROR_OBJECT 01
 #define ERROR_REACHABLE 02
 #define ERROR_PACK 04

+#define ERROR_REFS 010

 
 #ifdef NO_D_INO_IN_DIRENT
 #define SORT_DIRENT 0
 
 #ifdef NO_D_INO_IN_DIRENT
 #define SORT_DIRENT 0


@@ -495,8 +496,10 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
                /* We'll continue with the rest despite the error.. */
                return 0;
        }
                /* We'll continue with the rest despite the error.. */
                return 0;
        }

-       if (obj->type != OBJ_COMMIT && is_branch(refname))
+       if (obj->type != OBJ_COMMIT && is_branch(refname)) {

                error("%s: not a commit", refname);
                error("%s: not a commit", refname);

+               errors_found |= ERROR_REFS;
+       }

        default_refs++;
        obj->used = 1;
        mark_object_reachable(obj);
        default_refs++;
        obj->used = 1;
        mark_object_reachable(obj);


@@ -559,17 +562,23 @@ static int fsck_head_link(void)
                fprintf(stderr, "Checking HEAD link\n");
 
        head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, &flag);
                fprintf(stderr, "Checking HEAD link\n");
 
        head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, &flag);

-       if (!head_points_at)
+       if (!head_points_at) {
+               errors_found |= ERROR_REFS;

                return error("Invalid HEAD");
                return error("Invalid HEAD");

+       }

        if (!strcmp(head_points_at, "HEAD"))
                /* detached HEAD */
                null_is_error = 1;
        if (!strcmp(head_points_at, "HEAD"))
                /* detached HEAD */
                null_is_error = 1;

-       else if (!starts_with(head_points_at, "refs/heads/"))
+       else if (!starts_with(head_points_at, "refs/heads/")) {
+               errors_found |= ERROR_REFS;

                return error("HEAD points to something strange (%s)",
                             head_points_at);
                return error("HEAD points to something strange (%s)",
                             head_points_at);

+       }

        if (is_null_oid(&head_oid)) {
        if (is_null_oid(&head_oid)) {

-               if (null_is_error)
+               if (null_is_error) {
+                       errors_found |= ERROR_REFS;

                        return error("HEAD: detached HEAD points at nothing");
                        return error("HEAD: detached HEAD points at nothing");

+               }

                fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n",
                        head_points_at + 11);
        }
                fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n",
                        head_points_at + 11);
        }


@@ -589,6 +598,7 @@ static int fsck_cache_tree(struct cache_tree *it)
                if (!obj) {
                        error("%s: invalid sha1 pointer in cache-tree",
                              sha1_to_hex(it->sha1));
                if (!obj) {
                        error("%s: invalid sha1 pointer in cache-tree",
                              sha1_to_hex(it->sha1));

+                       errors_found |= ERROR_REFS;

                        return 1;
                }
                obj->used = 1;
                        return 1;
                }
                obj->used = 1;

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index cfb32b62420dc162e79aaea29a36f7d78f3353f5..0ad04da01606d678fb433d724a5a03ac04be2a37 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -77,11 +77,31 @@ test_expect_success 'object with bad sha1' '
 test_expect_success 'branch pointing to non-commit' '
        git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
        test_when_finished "git update-ref -d refs/heads/invalid" &&
 test_expect_success 'branch pointing to non-commit' '
        git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
        test_when_finished "git update-ref -d refs/heads/invalid" &&

-       git fsck 2>out &&
+       test_must_fail git fsck 2>out &&

        cat out &&
        grep "not a commit" out
 '
 
        cat out &&
        grep "not a commit" out
 '
 

+test_expect_success 'HEAD link pointing at a funny object' '
+       test_when_finished "mv .git/SAVED_HEAD .git/HEAD" &&
+       mv .git/HEAD .git/SAVED_HEAD &&
+       echo 0000000000000000000000000000000000000000 >.git/HEAD &&
+       # avoid corrupt/broken HEAD from interfering with repo discovery
+       test_must_fail env GIT_DIR=.git git fsck 2>out &&
+       cat out &&
+       grep "detached HEAD points" out
+'
+
+test_expect_success 'HEAD link pointing at a funny place' '
+       test_when_finished "mv .git/SAVED_HEAD .git/HEAD" &&
+       mv .git/HEAD .git/SAVED_HEAD &&
+       echo "ref: refs/funny/place" >.git/HEAD &&
+       # avoid corrupt/broken HEAD from interfering with repo discovery
+       test_must_fail env GIT_DIR=.git git fsck 2>out &&
+       cat out &&
+       grep "HEAD points to something strange" out
+'
+

 test_expect_success 'email without @ is okay' '
        git cat-file commit HEAD >basis &&
        sed "s/@/AT/" basis >okay &&
 test_expect_success 'email without @ is okay' '
        git cat-file commit HEAD >basis &&
        sed "s/@/AT/" basis >okay &&