[PATCH] fetch.c: Remove some duplicated code in process()

diff --git a/sha1_name.c b/sha1_name.c
index df45b172a3033cad47e5039defc6de45748aeb5f..b4fed924f7ac95571904874fffe8012940f9febb 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -84,19 +84,19 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
        return 0;
 }
 
-static int get_short_sha1(const char *name, unsigned char *sha1)
+static int get_short_sha1(const char *name, int len, unsigned char *sha1)
 {
        int i;
        char canonical[40];
        unsigned char res[20];
 
+       if (len < 4)
+               return -1;
        memset(res, 0, 20);
        memset(canonical, 'x', 40);
-       for (i = 0;;i++) {
+       for (i = 0; i < len ;i++) {
                unsigned char c = name[i];
                unsigned char val;
-               if (!c || i > 40)
-                       break;
                if (c >= '0' && c <= '9')
                        val = c - '0';
                else if (c >= 'a' && c <= 'f')
@@ -112,8 +112,6 @@ static int get_short_sha1(const char *name, unsigned char *sha1)
                        val <<= 4;
                res[i >> 1] |= val;
        }
-       if (i < 4)
-               return -1;
        if (find_short_object_filename(i, canonical, sha1))
                return 0;
        if (find_short_packed_object(i, res, sha1))
@@ -143,12 +141,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
                "refs",
                "refs/tags",
                "refs/heads",
-               "refs/snap",
                NULL
        };
        const char **p;
 
-       if (!get_sha1_hex(str, sha1))
+       if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;
 
        for (p = prefix; *p; p++) {
@@ -192,9 +189,29 @@ static int get_parent(const char *name, int len,
        return -1;
 }
 
+static int get_nth_ancestor(const char *name, int len,
+                           unsigned char *result, int generation)
+{
+       unsigned char sha1[20];
+       int ret = get_sha1_1(name, len, sha1);
+       if (ret)
+               return ret;
+
+       while (generation--) {
+               struct commit *commit = lookup_commit_reference(sha1);
+
+               if (!commit || parse_commit(commit) || !commit->parents)
+                       return -1;
+               memcpy(sha1, commit->parents->item->object.sha1, 20);
+       }
+       memcpy(result, sha1, 20);
+       return 0;
+}
+
 static int get_sha1_1(const char *name, int len, unsigned char *sha1)
 {
        int parent, ret;
+       const char *cp;
 
        /* foo^[0-9] or foo^ (== foo^1); we do not do more than 9 parents. */
        if (len > 2 && name[len-2] == '^' &&
@@ -211,10 +228,31 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
        if (parent >= 0)
                return get_parent(name, len, sha1, parent);
 
+       /* "name~3" is "name^^^",
+        * "name~12" is "name^^^^^^^^^^^^", and
+        * "name~" and "name~0" are name -- not "name^0"!
+        */
+       parent = 0;
+       for (cp = name + len - 1; name <= cp; cp--) {
+               int ch = *cp;
+               if ('0' <= ch && ch <= '9')
+                       continue;
+               if (ch != '~')
+                       parent = -1;
+               break;
+       }
+       if (!parent && *cp == '~') {
+               int len1 = cp - name;
+               cp++;
+               while (cp < name + len)
+                       parent = parent * 10 + *cp++ - '0';
+               return get_nth_ancestor(name, len1, sha1, parent);
+       }
+
        ret = get_sha1_basic(name, len, sha1);
        if (!ret)
                return 0;
-       return get_short_sha1(name, sha1);
+       return get_short_sha1(name, len, sha1);
 }
 
 /*