show-branch: mark active branch with a '*' again

diff --git a/git-checkout.sh b/git-checkout.sh
index 580a9e8a233f0a94c84792eba7c3dc653fccf3a0..c60e029b6da34f43b45300400fbef0667ce9652f 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -22,7 +22,7 @@ while [ "$#" != "0" ]; do
                shift
                [ -z "$newbranch" ] &&
                        die "git checkout: -b needs a branch name"
-               [ -e "$GIT_DIR/refs/heads/$newbranch" ] &&
+               git-rev-parse --symbolic "heads/$newbranch" >&/dev/null &&
                        die "git checkout: branch $newbranch already exists"
                git-check-ref-format "heads/$newbranch" ||
                        die "git checkout: we do not like '$newbranch' as a branch name."
@@ -51,7 +51,7 @@ while [ "$#" != "0" ]; do
                        fi
                        new="$rev"
                        new_name="$arg^0"
-                       if [ -f "$GIT_DIR/refs/heads/$arg" ]; then
+                       if git-rev-parse "heads/$arg^0" >&/dev/null; then
                                branch="$arg"
                        fi
                elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null)