aboutsummaryrefslogtreecommitdiff
path: root/update-ref.c
diff options
context:
space:
mode:
authorJunio C Hamano <junio@twinsun.com>2005-09-30 14:08:25 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-01 23:19:33 -0700
commita876ed83be5467d6075da8a16306724cb1babc2a (patch)
treee059141db27747dda564fa5981c3f27ebeb04cc8 /update-ref.c
parentca8db1424d1808a1f78bc9905efd267f7c154d8e (diff)
downloadgit-a876ed83be5467d6075da8a16306724cb1babc2a.tar.gz
git-a876ed83be5467d6075da8a16306724cb1babc2a.tar.xz
Use resolve_ref() to implement read_ref().
Symbolic refs are understood by resolve_ref(), so existing read_ref() users will automatically understand them as well. Signed-off-by: Junio C Hamano <junio@twinsun.com>
Diffstat (limited to 'update-ref.c')
-rw-r--r--update-ref.c62
1 files changed, 1 insertions, 61 deletions
diff --git a/update-ref.c b/update-ref.c
index 6919cead4..4a1704c1a 100644
--- a/update-ref.c
+++ b/update-ref.c
@@ -4,66 +4,6 @@
static const char git_update_ref_usage[] = "git-update-ref <refname> <value> [<oldval>]";
-#define MAXDEPTH 5
-
-static const char *resolve_ref(const char *path, unsigned char *sha1)
-{
- int depth = MAXDEPTH, len;
- char buffer[256];
-
- for (;;) {
- struct stat st;
- char *buf;
- int fd;
-
- if (--depth < 0)
- return NULL;
-
- /* Special case: non-existing file */
- if (lstat(path, &st) < 0) {
- if (errno != ENOENT)
- return NULL;
- memset(sha1, 0, 20);
- return path;
- }
-
- /* Follow "normalized" - ie "refs/.." symlinks by hand */
- if (S_ISLNK(st.st_mode)) {
- len = readlink(path, buffer, sizeof(buffer)-1);
- if (len >= 5 && !memcmp("refs/", buffer, 5)) {
- path = git_path("%.*s", len, buffer);
- continue;
- }
- }
-
- /*
- * Anything else, just open it and try to use it as
- * a ref
- */
- fd = open(path, O_RDONLY);
- if (fd < 0)
- return NULL;
- len = read(fd, buffer, sizeof(buffer)-1);
- close(fd);
-
- /*
- * Is it a symbolic ref?
- */
- if (len < 4 || memcmp("ref:", buffer, 4))
- break;
- buf = buffer + 4;
- len -= 4;
- while (len && isspace(*buf))
- buf++, len--;
- while (len && isspace(buf[len-1]))
- buf[--len] = 0;
- path = git_path("%.*s", len, buf);
- }
- if (len < 40 || get_sha1_hex(buffer, sha1))
- return NULL;
- return path;
-}
-
static int re_verify(const char *path, unsigned char *oldsha1, unsigned char *currsha1)
{
char buf[40];
@@ -97,7 +37,7 @@ int main(int argc, char **argv)
if (oldval && get_sha1(oldval, oldsha1) < 0)
die("%s: not a valid old SHA1", oldval);
- path = resolve_ref(git_path("%s", refname), currsha1);
+ path = resolve_ref(git_path("%s", refname), currsha1, !!oldval);
if (!path)
die("No such ref: %s", refname);