Re: git does the wrong thing with ambiguous names
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- Jun 7, 2007, 00:01 UTC
- Message-ID
- <20070607000100.GE3969@steel.home>
- In-Reply-To
- <20070606233327.GD3969@steel.home>
Alex Riesen, Thu, Jun 07, 2007 01:33:27 +0200:
Show 25 quoted lines
> Alex Riesen, Thu, Jun 07, 2007 00:58:26 +0200: > > Brandon Casey, Thu, Jun 07, 2007 00:13:48 +0200: > > > > > > When a branch and tag have the same name, a git-checkout using that name > > > succeeds (exits zero without complaining), switches to the _branch_, but > > > updates the working directory contents to that specified by the _tag_. > > > git-status show modified files. > > > > Bad. To reproduce: > > > > mkdir a && cd a && git init && :> a && git add . && git commit -m1 && > > :>b && git add . && git commit -m2 && git tag master HEAD^ && > > find .git/refs/ && gco -b new && gco master && git status > > > > git-rev-parse actually warns about ambguities: > > $ git-rev-parse --verify master > warning: refname 'master' is ambiguous. > dd5cdc387f2160bf04d02ac08dfdaf952f769357 > > It's just that the warning is thrown away in git-checkout.sh > > A quick and _very_ messy fix could like like that: >
This one is much shorter and less friendly. Suggested by Junio on irc. It makes checkout always prefer a branch.
diff --git a/git-checkout.sh b/git-checkout.sh index 6b6facf..282c84f 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -67,6 +67,8 @@ while [ "$#" != "0" ]; do new_name="$arg" if git-show-ref --verify --quiet -- "refs/heads/$arg" then + rev=$(git-rev-parse --verify "refs/heads/$arg^0" 2>/dev/null) + new="$rev" branch="$arg" fi elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null)