summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-29 08:02:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-04 06:43:59 (GMT)
commit3e0318a3613ae8e89dcb1fc39d909145e64287b9 (patch)
tree2628fd1fd8f43af290cbd795c1d96e17f7f90edf /git-checkout.sh
parent89815cab95268e8f0f58142b848ac4cd5e9cbdcb (diff)
downloadgit-3e0318a3613ae8e89dcb1fc39d909145e64287b9.zip
git-3e0318a3613ae8e89dcb1fc39d909145e64287b9.tar.gz
git-3e0318a3613ae8e89dcb1fc39d909145e64287b9.tar.bz2
checkout: allow detaching to HEAD even when switching to the tip of a branch
You cannot currently checkout the tip of an existing branch without moving to the branch. This allows you to detach your HEAD and place it at such a commit, with: $ git checkout master^0 Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index a7390e8..deb0a9a 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -170,7 +170,7 @@ describe_detached_head () {
}
}
-if test -z "$branch$newbranch" && test "$new" != "$old"
+if test -z "$branch$newbranch" && test "$new_name" != "$old_name"
then
detached="$new"
if test -n "$oldbranch" && test -z "$quiet"
@@ -180,7 +180,7 @@ If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>"
fi
-elif test -z "$oldbranch"
+elif test -z "$oldbranch" && test "$new" != "$old"
then
describe_detached_head 'Previous HEAD position was' "$old"
fi