diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-18 01:08:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-18 01:08:00 -0700 |
| commit | 5b10b091139ea5ef87376998c89f3a20dd7c7793 (patch) | |
| tree | 9980afa706ab2ea2da155abd8e55be971a19943a /fsck-objects.c | |
| parent | b3dc864c6d5ffb96513328f976c076c3a90331b0 (diff) | |
| download | git-5b10b091139ea5ef87376998c89f3a20dd7c7793.tar.gz git-5b10b091139ea5ef87376998c89f3a20dd7c7793.tar.xz | |
fsck-objects: adjust to resolve_ref() clean-up.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fsck-objects.c')
| -rw-r--r-- | fsck-objects.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fsck-objects.c b/fsck-objects.c index 4d994f3fc..456c17e2f 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -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; |