summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f8acdb)
raw | patch | inline | side by side (parent: 2f8acdb)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 21 Mar 2006 09:42:04 +0000 (01:42 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 21 Mar 2006 09:42:04 +0000 (01:42 -0800) |
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>
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>
sha1_name.c | patch | blob | history |
diff --git a/sha1_name.c b/sha1_name.c
index 74c479c5e654354d2516477f8fe3e8366bdc2dd7..3adaec3167d19fd9e3f2c3f6c06530583428c3c6 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
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;
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 &&