summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-21 00:43:12 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-21 00:43:12 -0800
commit924215024c72bc359fad920010dd6b356a5140c8 (patch)
tree339319e60db7b3f96f8c711407b135a54da7aa2e /sha1_name.c
parente0a87193d3f2b78b7b687405c0315e1517d36912 (diff)
downloadgit-924215024c72bc359fad920010dd6b356a5140c8.tar.gz
Make sure heads/foo and tags/foo do not confuse things.
When both heads/foo and tags/foo exist, get_sha1_basic("foo") picked up the tag without complaining, which is quite confusing. Make sure we require unambiguous form, "heads/foo" or "tags/foo" in such cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/sha1_name.c b/sha1_name.c
index be1755a70b..faac158b16 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -236,6 +236,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
NULL
};
const char **p;
+ int found = 0;
if (len == 40 && !get_sha1_hex(str, sha1))
return 0;
@@ -246,10 +247,20 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
for (p = prefix; *p; p++) {
char *pathname = git_path("%s/%.*s", *p, len, str);
- if (!read_ref(pathname, sha1))
- return 0;
+ if (!read_ref(pathname, sha1)) {
+ /* Must be unique; i.e. when heads/foo and
+ * tags/foo are both present, reject "foo".
+ * Note that read_ref() eventually calls
+ * get_sha1_hex() which can smudge initial
+ * part of the buffer even if what is read
+ * is found to be invalid halfway.
+ */
+ if (1 < found++)
+ return -1;
+ }
}
-
+ if (found == 1)
+ return 0;
return -1;
}