[PATCH] Remove misguided branch disambiguation.

[PATCH] Remove misguided branch disambiguation.

[Junio C Hamano]

This removes the misguided attempt to refuse processing a branch
name xyzzy and insist it to be given as either heads/xyzzy or
tags/xyzzy when a tag xyzzy exists.  There was no reason to do
so --- the search order was predictable and well defined, so if
the user says xyzzy we should have taken the tag xyzzy in such a
case without complaining.

This incidentally fixes another subtle bug related to this.  If
such a duplicate branch/tag name happened to be a unique valid
prefix of an existing commit object name (say, "beef"), we did
not take the tag "beef" but after complaining used the commit
object whose name started with beef.

Another problem this fixes while introducing some confusion is
that there is no longer a reason to forbid a branch name HEAD
anymore.  In other words, now "git pull . ref1:HEAD" would work
as expected, once we revert "We do not like HEAD branch" patch.
It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or
fast-forwards if already exists) using the tip of ref1 branch
from the current repository, and merges it into the current
branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

---

 sha1_name.c |   33 +++------------------------------
 1 files changed, 3 insertions(+), 30 deletions(-)

a012e1b2b5218729e148befd0705bd52962ac272
diff --git a/sha1_name.c b/sha1_name.c
index bf8f0f0..49e2cc3 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -238,7 +238,6 @@ static int get_sha1_basic(const char *st
 		NULL
 	};
 	const char **p;
-	int found = 0;
 
 	if (len == 40 && !get_sha1_hex(str, sha1))
 		return 0;
@@ -249,36 +248,10 @@ static int get_sha1_basic(const char *st
 
 	for (p = prefix; *p; p++) {
 		char *pathname = git_path("%s/%.*s", *p, len, str);
-
-		if (!read_ref(pathname, sha1)) {
-			/* Must be unique; i.e. when heads/foo and
-			 * tags/foo are both present, reject "foo".
-			 */
-			if (1 < found++)
-				return -1;
-		}
-
-		/* We want to allow .git/description file and
-		 * "description" branch to exist at the same time.
-		 * "git-rev-parse description" should silently skip
-		 * .git/description file as a candidate for
-		 * get_sha1().  However, having garbage file anywhere
-		 * under refs/ is not OK, and we would not have caught
-		 * ambiguous heads and tags with the above test.
-		 */
-		else if (**p && !access(pathname, F_OK)) {
-			/* Garbage exists under .git/refs */
-			return error("garbage ref found '%s'", pathname);
-		}
-	}
-	switch (found) {
-	case 0:
-		return -1;
-	case 1:
-		return 0;
-	default:
-		return error("ambiguous refname '%.*s'", len, str);
+		if (!read_ref(pathname, sha1))
+			return 0;
 	}
+	return -1;
 }
 
 static int get_sha1_1(const char *name, int len, unsigned char *sha1);
-- 
0.99.9.GIT

Re: [PATCH] Remove misguided branch disambiguation.

[Alex Riesen]

Junio C Hamano, Sat, Dec 17, 2005 10:37:38 +0100:
> This removes the misguided attempt to refuse processing a branch
> name xyzzy and insist it to be given as either heads/xyzzy or
> tags/xyzzy when a tag xyzzy exists.  There was no reason to do
> so --- the search order was predictable and well defined, so if
> the user says xyzzy we should have taken the tag xyzzy in such a
> case without complaining.

Right. The test 'Ambiguous' in t0000-basic is redundant now, btw

Re: [PATCH] Remove misguided branch disambiguation.

[Junio C Hamano]

Alex Riesen <raa.lkml@gmail.com> writes:

> Right. The test 'Ambiguous' in t0000-basic is redundant now, btw

I reverted that in jc/tail branch (part of pu branch) as well.