binary diff: further updates.

diff --git a/sha1_name.c b/sha1_name.c
index ba0747c84dd1298093101e8726f2ee21d7ed23e6..345935bb2beddac7b86d5b989ea1492f58a777d8 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
+#include "tree-walk.h"
 
 static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
 {
@@ -186,16 +187,18 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
 
 const char *find_unique_abbrev(const unsigned char *sha1, int len)
 {
-       int status;
+       int status, is_null;
        static char hex[41];
 
+       is_null = !memcmp(sha1, null_sha1, 20);
        memcpy(hex, sha1_to_hex(sha1), 40);
        if (len == 40)
                return hex;
        while (len < 40) {
                unsigned char sha1_ret[20];
                status = get_short_sha1(hex, len, sha1_ret, 1);
-               if (!status) {
+               if (!status ||
+                   (is_null && status != SHORT_NAME_AMBIGUOUS)) {
                        hex[len] = 0;
                        return hex;
                }
@@ -233,14 +236,21 @@ static int ambiguous_path(const char *path, int len)
 
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 {
-       static const char *prefix[] = {
-               "",
-               "refs",
-               "refs/tags",
-               "refs/heads",
+       static const char *fmt[] = {
+               "%.*s",
+               "refs/%.*s",
+               "refs/tags/%.*s",
+               "refs/heads/%.*s",
+               "refs/remotes/%.*s",
+               "refs/remotes/%.*s/HEAD",
                NULL
        };
        const char **p;
+       const char *warning = "warning: refname '%.*s' is ambiguous.\n";
+       char *pathname;
+       int already_found = 0;
+       unsigned char *this_result;
+       unsigned char sha1_from_ref[20];
 
        if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;
@@ -249,11 +259,21 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
        if (ambiguous_path(str, len))
                return -1;
 
-       for (p = prefix; *p; p++) {
-               char *pathname = git_path("%s/%.*s", *p, len, str);
-               if (!read_ref(pathname, sha1))
-                       return 0;
+       for (p = fmt; *p; p++) {
+               this_result = already_found ? sha1_from_ref : sha1;
+               pathname = git_path(*p, len, str);
+               if (!read_ref(pathname, this_result)) {
+                       if (warn_ambiguous_refs) {
+                               if (already_found)
+                                       fprintf(stderr, warning, len, str);
+                               already_found++;
+                       }
+                       else
+                               return 0;
+               }
        }
+       if (already_found)
+               return 0;
        return -1;
 }
 
@@ -388,43 +408,36 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
 
 static int get_sha1_1(const char *name, int len, unsigned char *sha1)
 {
-       int parent, ret;
+       int ret, has_suffix;
        const char *cp;
 
-       /* foo^[0-9] or foo^ (== foo^1); we do not do more than 9 parents. */
-       if (len > 2 && name[len-2] == '^' &&
-           name[len-1] >= '0' && name[len-1] <= '9') {
-               parent = name[len-1] - '0';
-               len -= 2;
-       }
-       else if (len > 1 && name[len-1] == '^') {
-               parent = 1;
-               len--;
-       } else
-               parent = -1;
-
-       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"!
+        * "name^" is not "name^0"; it is "name^1".
         */
-       parent = 0;
+       has_suffix = 0;
        for (cp = name + len - 1; name <= cp; cp--) {
                int ch = *cp;
                if ('0' <= ch && ch <= '9')
                        continue;
-               if (ch != '~')
-                       parent = -1;
+               if (ch == '~' || ch == '^')
+                       has_suffix = ch;
                break;
        }
-       if (!parent && *cp == '~') {
+
+       if (has_suffix) {
+               int num = 0;
                int len1 = cp - name;
                cp++;
                while (cp < name + len)
-                       parent = parent * 10 + *cp++ - '0';
-               return get_nth_ancestor(name, len1, sha1, parent);
+                       num = num * 10 + *cp++ - '0';
+               if (has_suffix == '^') {
+                       if (!num && len1 == len - 1)
+                               num = 1;
+                       return get_parent(name, len1, sha1, num);
+               }
+               /* else if (has_suffix == '~') -- goes without saying */
+               return get_nth_ancestor(name, len1, sha1, num);
        }
 
        ret = peel_onion(name, len, sha1);
@@ -443,6 +456,19 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
  */
 int get_sha1(const char *name, unsigned char *sha1)
 {
+       int ret;
+       unsigned unused;
+
        prepare_alt_odb();
-       return get_sha1_1(name, strlen(name), sha1);
+       ret = get_sha1_1(name, strlen(name), sha1);
+       if (ret < 0) {
+               const char *cp = strchr(name, ':');
+               if (cp) {
+                       unsigned char tree_sha1[20];
+                       if (!get_sha1_1(name, cp-name, tree_sha1))
+                               return get_tree_entry(tree_sha1, cp+1, sha1,
+                                                     &unused);
+               }
+       }
+       return ret;
 }