On Fri, Jan 07, 2011 at 02:49:09PM -0500, Jeff King wrote: > 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. Ah, never mind. After reading Junio's response, it looks like we already try to do the right thing in checkout, but it's just broken. So forget my two-step plan. Here is the test script I worked out which shows the issue (and checks that the right messages are shown to the user): --- t/t2019-checkout-amiguous-ref.sh | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) create mode 100755 t/t2019-checkout-amiguous-ref.sh diff --git a/t/t2019-checkout-amiguous-ref.sh b/t/t2019-checkout-amiguous-ref.sh new file mode 100755 index 0000000..12edce8 --- /dev/null +++ b/t/t2019-checkout-amiguous-ref.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +test_description='checkout handling of ambiguous (branch/tag) refs' +. ./test-lib.sh + +test_expect_success 'setup ambiguous refs' ' + test_commit branch file && + git branch ambiguity && + test_commit tag file && + git tag ambiguity && + test_commit other file +' + +test_expect_success 'checkout ambiguous ref succeeds' ' + git checkout ambiguity >stdout 2>stderr +' + +test_expect_success 'checkout produces ambiguity warning' ' + grep "warning.*ambiguous" stderr +' + +test_expect_failure 'checkout chooses branch over tag' ' + echo branch >expect && + test_cmp expect file +' + +test_expect_success 'checkout reports switch to detached HEAD' ' + grep "Switched to branch" stderr && + ! grep "^HEAD is now at" stderr +' + +test_done -- 1.7.4.rc1.23.g84303 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html