kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD 

This implements the suggestion by Jeff King to use
refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean
the primary branch head of a tracked remote.  clone needs to be
told about this convention as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-03-21 01:42:04 -08:00
parent 2f8acdb38e
commit c51d13692d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sha1_name.c
View File

@ -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 int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{ {
static const char *prefix[] = { static const char *fmt[] = {
"", "/%.*s",
"refs", "refs/%.*s",
"refs/tags", "refs/tags/%.*s",
"refs/heads", "refs/heads/%.*s",
"refs/remotes", "refs/remotes/%.*s",
"refs/remotes/%.*s/HEAD",
NULL NULL
}; };
const char **p; const char **p;
const char *warning = "warning: refname '%.*s' is ambiguous.\n"; const char *warning = "warning: refname '%.*s' is ambiguous.\n";
char *pathname; char *pathname;
int already_found = 0; int already_found = 0;
unsigned char *this_result;
unsigned char sha1_from_ref[20];


if (len == 40 && !get_sha1_hex(str, sha1)) if (len == 40 && !get_sha1_hex(str, sha1))
return 0; return 0;
@ -255,11 +258,9 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
if (ambiguous_path(str, len)) if (ambiguous_path(str, len))
return -1; return -1;


for (p = prefix; *p; p++) { for (p = fmt; *p; p++) {
unsigned char sha1_from_ref[20]; this_result = already_found ? sha1_from_ref : sha1;
unsigned char *this_result = pathname = git_path(*p, len, str);
already_found ? sha1_from_ref : sha1;
pathname = git_path("%s/%.*s", *p, len, str);
if (!read_ref(pathname, this_result)) { if (!read_ref(pathname, this_result)) {
if (warn_ambiguous_refs) { if (warn_ambiguous_refs) {
if (already_found && if (already_found &&