Merge branch 'fixes'

diff --git a/update-ref.c b/update-ref.c
index 1863b823240790c450e29c1c82041972713d716b..4a1704c1a538ffde8eed46d4efb253b2d9b31b7f 100644 (file)
--- a/update-ref.c
+++ b/update-ref.c
@@ -4,53 +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;
-               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);
-               break;
-       }
-       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];
@@ -84,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);