mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck-objects: adjust to resolve_ref() clean-up.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-09-18 01:08:00 -07:00
parent b3dc864c6d
commit 5b10b09113
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fsck-objects.c
View File

@ -458,15 +458,13 @@ static void fsck_object_dir(const char *path)
static int fsck_head_link(void) static int fsck_head_link(void)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
const char *git_HEAD = xstrdup(git_path("HEAD")); const char *head_points_at = resolve_ref("HEAD", sha1, 1);
const char *git_refs_heads_master = resolve_ref(git_HEAD, sha1, 1);
int pfxlen = strlen(git_HEAD) - 4; /* strip .../.git/ part */
if (!git_refs_heads_master) if (!head_points_at)
return error("HEAD is not a symbolic ref"); 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)", return error("HEAD points to something strange (%s)",
git_refs_heads_master + pfxlen); head_points_at);
if (is_null_sha1(sha1)) if (is_null_sha1(sha1))
return error("HEAD: not a valid git pointer"); return error("HEAD: not a valid git pointer");
return 0; return 0;