diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-08 02:55:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-08 02:55:19 -0700 |
| commit | abc403f58452da667b261274a1091af61dfec35c (patch) | |
| tree | 93e073859ddce0d1f2ce9067cb1adf93d73c9b7f /git-checkout.sh | |
| parent | Even more missing static (diff) | |
| parent | checkout: do not get confused with ambiguous tag/branch names (diff) | |
| download | tgif-abc403f58452da667b261274a1091af61dfec35c.tar.xz | |
Merge branch 'maint'
* maint:
checkout: do not get confused with ambiguous tag/branch names
Diffstat (limited to 'git-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index d561c88dcb..33f1e87c0c 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -63,12 +63,13 @@ while [ "$#" != "0" ]; do echo "unknown flag $arg" exit 1 fi - new="$rev" new_name="$arg" if git-show-ref --verify --quiet -- "refs/heads/$arg" then + rev=$(git-rev-parse --verify "refs/heads/$arg^0") branch="$arg" fi + new="$rev" elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null) then # checking out selected paths from a tree-ish. |