undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwim_ref(): Separate name-to-ref DWIM code out.

Browse Source 
I'll be using this in another function to figure out what to
pass to resolve_ref().

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-19 01:15:15 -08:00
parent 6f71686e0b
commit e86eb6668e
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -299,6 +299,8 @@ extern int get_sha1_hex(const char *hex, unsigned char *sha1);
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */ extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
extern int read_ref(const char *filename, unsigned char *sha1); extern int read_ref(const char *filename, unsigned char *sha1);
extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *); extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
extern int create_symref(const char *ref, const char *refs_heads_master); extern int create_symref(const char *ref, const char *refs_heads_master);
extern int validate_headref(const char *ref); extern int validate_headref(const char *ref);

38
sha1_name.c
View File

@ -235,7 +235,7 @@ static int ambiguous_path(const char *path, int len)
return slash; return slash;
} }
static int get_sha1_basic(const char *str, int len, unsigned char *sha1) int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
{ {
static const char *fmt[] = { static const char *fmt[] = {
"%.*s", "%.*s",
@ -246,13 +246,32 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
"refs/remotes/%.*s/HEAD", "refs/remotes/%.*s/HEAD",
NULL NULL
}; };
const char **p, *r;
int refs_found = 0;
*ref = NULL;
for (p = fmt; *p; p++) {
unsigned char sha1_from_ref[20];
unsigned char *this_result;
this_result = refs_found ? sha1_from_ref : sha1;
r = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
if (r) {
if (!refs_found++)
*ref = xstrdup(r);
if (!warn_ambiguous_refs)
break;
}
}
return refs_found;
}
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
const char **p, *ref;
char *real_ref = NULL; char *real_ref = NULL;
int refs_found = 0; int refs_found = 0;
int at, reflog_len; int at, reflog_len;
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;
@ -273,16 +292,7 @@ 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 = fmt; *p; p++) { refs_found = dwim_ref(str, len, sha1, &real_ref);
this_result = refs_found ? sha1_from_ref : sha1;
ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
if (ref) {
if (!refs_found++)
real_ref = xstrdup(ref);
if (!warn_ambiguous_refs)
break;
}
}
if (!refs_found) if (!refs_found)
return -1; return -1;