From 924215024c72bc359fad920010dd6b356a5140c8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Nov 2005 00:43:12 -0800 Subject: 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 --- show-branch.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'show-branch.c') diff --git a/show-branch.c b/show-branch.c index 631336cd9..d8808eefc 100644 --- a/show-branch.c +++ b/show-branch.c @@ -313,9 +313,16 @@ static int append_ref(const char *refname, const unsigned char *sha1) static int append_head_ref(const char *refname, const unsigned char *sha1) { - if (strncmp(refname, "refs/heads/", 11)) + unsigned char tmp[20]; + int ofs = 11; + if (strncmp(refname, "refs/heads/", ofs)) return 0; - return append_ref(refname + 11, sha1); + /* If both heads/foo and tags/foo exists, get_sha1 would + * get confused. + */ + if (get_sha1(refname + ofs, tmp) || memcmp(tmp, sha1, 20)) + ofs = 5; + return append_ref(refname + ofs, sha1); } static int append_tag_ref(const char *refname, const unsigned char *sha1) @@ -470,7 +477,7 @@ int main(int ac, char **av) if (MAX_REVS <= num_rev) die("cannot handle more than %d revs.", MAX_REVS); if (get_sha1(ref_name[num_rev], revkey)) - usage(show_branch_usage); + die("'%s' is not a valid ref.\n", ref_name[num_rev]); commit = lookup_commit_reference(revkey); if (!commit) die("cannot find commit %s (%s)", -- cgit v1.2.1