X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=sha1_name.c;h=4f92e12a8dfce29b5bb50108468259d9f04653f3;hb=e51c3b50063d52ecd209a6f9846570d660e6310c;hp=d0896f8183d87df53d80c6e5e72ebdb5932c29a8;hpb=82ed2bcd920d73d218e94c95178be6a61ec7ed54;p=git.git diff --git a/sha1_name.c b/sha1_name.c index d0896f81..4f92e12a 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -122,6 +122,9 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne return found; } +#define SHORT_NAME_NOT_FOUND (-1) +#define SHORT_NAME_AMBIGUOUS (-2) + static int find_unique_short_object(int len, char *canonical, unsigned char *res, unsigned char *sha1) { @@ -131,27 +134,28 @@ static int find_unique_short_object(int len, char *canonical, has_unpacked = find_short_object_filename(len, canonical, unpacked_sha1); has_packed = find_short_packed_object(len, res, packed_sha1); if (!has_unpacked && !has_packed) - return -1; + return SHORT_NAME_NOT_FOUND; if (1 < has_unpacked || 1 < has_packed) - return error("short SHA1 %.*s is ambiguous.", len, canonical); + return SHORT_NAME_AMBIGUOUS; if (has_unpacked != has_packed) { memcpy(sha1, (has_packed ? packed_sha1 : unpacked_sha1), 20); return 0; } /* Both have unique ones -- do they match? */ if (memcmp(packed_sha1, unpacked_sha1, 20)) - return error("short SHA1 %.*s is ambiguous.", len, canonical); + return SHORT_NAME_AMBIGUOUS; memcpy(sha1, packed_sha1, 20); return 0; } -static int get_short_sha1(const char *name, int len, unsigned char *sha1) +static int get_short_sha1(const char *name, int len, unsigned char *sha1, + int quietly) { - int i; + int i, status; char canonical[40]; unsigned char res[20]; - if (len < 4) + if (len < MINIMUM_ABBREV) return -1; memset(res, 0, 20); memset(canonical, 'x', 40); @@ -174,29 +178,101 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1) res[i >> 1] |= val; } - return find_unique_short_object(i, canonical, res, sha1); + status = find_unique_short_object(i, canonical, res, sha1); + if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) + return error("short SHA1 %.*s is ambiguous.", len, canonical); + return status; +} + +const char *find_unique_abbrev(const unsigned char *sha1, int len) +{ + 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 || + (is_null && status != SHORT_NAME_AMBIGUOUS)) { + hex[len] = 0; + return hex; + } + if (status != SHORT_NAME_AMBIGUOUS) + return NULL; + len++; + } + return NULL; +} + +static int ambiguous_path(const char *path, int len) +{ + int slash = 1; + int cnt; + + for (cnt = 0; cnt < len; cnt++) { + switch (*path++) { + case '\0': + break; + case '/': + if (slash) + break; + slash = 1; + continue; + case '.': + continue; + default: + slash = 0; + continue; + } + break; + } + return slash; } 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; - for (p = prefix; *p; p++) { - char *pathname = git_path("%s/%.*s", *p, len, str); - if (!read_ref(pathname, sha1)) - return 0; - } + /* Accept only unambiguous ref paths. */ + if (ambiguous_path(str, len)) + return -1; + 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; } @@ -296,7 +372,9 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) if (!o) return -1; if (!type_string) { - o = deref_tag(o); + o = deref_tag(o, name, sp - name - 2); + if (!o || (!o->parsed && !parse_object(o->sha1))) + return -1; memcpy(sha1, o->sha1, 20); } else { @@ -306,7 +384,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) */ while (1) { - if (!o) + if (!o || (!o->parsed && !parse_object(o->sha1))) return -1; if (o->type == type_string) { memcpy(sha1, o->sha1, 20); @@ -329,43 +407,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); @@ -375,7 +446,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1) ret = get_sha1_basic(name, len, sha1); if (!ret) return 0; - return get_short_sha1(name, len, sha1); + return get_short_sha1(name, len, sha1, 0); } /*