Re: git does the wrong thing with ambiguous names
From: Brandon Casey <hidden>
Date: 2016-06-15 22:43:14
Alex Riesen wrote:
Alex Riesen, Thu, Jun 07, 2007 01:33:27 +0200:quoted
Alex Riesen, Thu, Jun 07, 2007 00:58:26 +0200:quoted
Brandon Casey, Thu, Jun 07, 2007 00:13:48 +0200:
[snip]
quoted hunk ↗ jump to hunk
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)
This doesn't work. Now the working directory contents are never updated when switching branches. Run my test script, or add an 'echo "some data" > a' in your shell code so that the two branches have different contents. -brandon