diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-21 02:04:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-21 02:04:46 -0800 |
| commit | 5a6696a0ed192bbcb63cacc545987009249c552f (patch) | |
| tree | 39a16ed91163b5f6bfb57a1c4b9830c2c1d79367 /sha1_name.c | |
| parent | Merge branch 'jc/name' into next (diff) | |
| parent | get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD (diff) | |
| download | tgif-5a6696a0ed192bbcb63cacc545987009249c552f.tar.xz | |
Merge branch 'jc/name' into next
* jc/name:
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sha1_name.c b/sha1_name.c index 74c479c5e6..3adaec3167 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -235,18 +235,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", - "refs/remotes", + 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; @@ -255,11 +258,9 @@ 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++) { - unsigned char sha1_from_ref[20]; - unsigned char *this_result = - already_found ? sha1_from_ref : sha1; - pathname = git_path("%s/%.*s", *p, len, str); + 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 && |