undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve_ref(): extract a function get_packed_ref()

Browse Source 
Making it a function and giving it a name makes the code clearer.  I
also have a strong suspicion that the function will find other uses in
the future.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2011-09-15 23:10:35 +02:00 committed by Junio C Hamano
parent 287750507d
commit c224ca7f66
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
refs.c
View File

@ -465,6 +465,23 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
return retval; return retval;
} }
/*
* Try to read ref from the packed references. On success, set sha1
* and return 0; otherwise, return -1.
*/
static int get_packed_ref(const char *ref, unsigned char *sha1)
{
struct ref_list *list = get_packed_refs(NULL);
while (list) {
if (!strcmp(ref, list->name)) {
hashcpy(sha1, list->sha1);
return 0;
}
list = list->next;
}
return -1;
}
/* /*
* If the "reading" argument is set, this function finds out what _object_ * If the "reading" argument is set, this function finds out what _object_
* the ref points at by "reading" the ref. The ref, if it is not symbolic, * the ref points at by "reading" the ref. The ref, if it is not symbolic,
@ -497,22 +514,26 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *
return NULL; return NULL;
git_snpath(path, sizeof(path), "%s", ref); git_snpath(path, sizeof(path), "%s", ref);
/* Special case: non-existing file. */
if (lstat(path, &st) < 0) { if (lstat(path, &st) < 0) {
struct ref_list *list = get_packed_refs(NULL); if (errno != ENOENT)
while (list) {
if (!strcmp(ref, list->name)) {
hashcpy(sha1, list->sha1);
if (flag)
*flag |= REF_ISPACKED;
return ref;
}
list = list->next;
}
if (reading || errno != ENOENT)
return NULL; return NULL;
hashclr(sha1); /*
return ref; * The loose reference file does not exist;
* check for a packed reference.
*/
if (!get_packed_ref(ref, sha1)) {
if (flag)
*flag |= REF_ISPACKED;
return ref;
}
/* The reference is not a packed reference, either. */
if (reading) {
return NULL;
} else {
hashclr(sha1);
return ref;
}
} }
/* Follow "normalized" - ie "refs/.." symlinks by hand */ /* Follow "normalized" - ie "refs/.." symlinks by hand */