Code

fsck-objects: adjust to resolve_ref() clean-up.
authorJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 08:08:00 +0000 (01:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 08:08:00 +0000 (01:08 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
fsck-objects.c

index 4d994f3fc83d71501bbfde5159a869b4f2a38e99..456c17e2f6c2d226248156065b1a47dad487c402 100644 (file)
@@ -458,15 +458,13 @@ static void fsck_object_dir(const char *path)
 static int fsck_head_link(void)
 {
        unsigned char sha1[20];
-       const char *git_HEAD = xstrdup(git_path("HEAD"));
-       const char *git_refs_heads_master = resolve_ref(git_HEAD, sha1, 1);
-       int pfxlen = strlen(git_HEAD) - 4; /* strip .../.git/ part */
+       const char *head_points_at = resolve_ref("HEAD", sha1, 1);
 
-       if (!git_refs_heads_master)
+       if (!head_points_at)
                return error("HEAD is not a symbolic ref");
-       if (strncmp(git_refs_heads_master + pfxlen, "refs/heads/", 11))
+       if (strncmp(head_points_at, "refs/heads/", 11))
                return error("HEAD points to something strange (%s)",
-                            git_refs_heads_master + pfxlen);
+                            head_points_at);
        if (is_null_sha1(sha1))
                return error("HEAD: not a valid git pointer");
        return 0;