Re: bug? in checkout with ambiguous refnames
- From
Jeff King <peff@peff.net>
- Date
- Jan 7, 2011, 19:49 UTC
- Message-ID
- <20110107194909.GB6175@sigill.intra.peff.net>
- In-Reply-To
- <20110107104650.GA5399@pengutronix.de>
On Fri, Jan 07, 2011 at 11:46:50AM +0100, Uwe Kleine-König wrote:
Show 11 quoted lines
> ukl@octopus:~/gsrc/linux-2.6$ git diff; git diff --cached > > ukl@octopus:~/gsrc/linux-2.6$ git checkout sgu/mxs-amba-uart > warning: refname 'sgu/mxs-amba-uart' is ambiguous. > Previous HEAD position was c13fb17... Merge commit '65e29a85a419f9a161ab0f09f9d69924e36d940e' into HEAD > Switched to branch 'sgu/mxs-amba-uart' > > OK, it might be a bad idea to have this ambiguity, still ... > [...] > So working copy and cache are at refs/tags/sgu/mxs-amba-uart, HEAD > points to refs/heads/sgu/mxs-amba-uart
Yeah, we generally resolve ambiguities in favor of the tag (and that warning comes from deep within get_sha1_basic). So the real bug here is that it still said "Switched to branch", which is totally wrong.
That being said, it probably would make more sense for "git checkout" to prefer branches to tags. That's probably going to take a lot more surgery, and we're in -rc right now. So I think the best thing to do is to fix the broken message and add some tests, and then if somebody wants to revisit it with a larger patch, they can do so on top.
I'll work on the first part and post a patch in a few minutes.
-Peff