kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sp/void' 

* sp/void:
  Allow git-checkout when on a non-existant branch.
maint
Junio C Hamano 2006-09-27 21:51:29 -07:00
parent f2ce6a4c3c 5a03e7f253
commit 2b83ade977
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-checkout.sh
View File

@ -4,8 +4,8 @@ USAGE='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
SUBDIRECTORY_OK=Sometimes SUBDIRECTORY_OK=Sometimes
. git-sh-setup . git-sh-setup


old=$(git-rev-parse HEAD)
old_name=HEAD old_name=HEAD
old=$(git-rev-parse --verify $old_name 2>/dev/null)
new= new=
new_name= new_name=
force= force=
@ -139,6 +139,13 @@ fi
die "git checkout: to checkout the requested commit you need to specify die "git checkout: to checkout the requested commit you need to specify
a name for a new branch which is created and switched to" a name for a new branch which is created and switched to"


if [ "X$old" = X ]
then
echo "warning: You do not appear to currently be on a branch." >&2
echo "warning: Forcing checkout of $new_name." >&2
force=1
fi

if [ "$force" ] if [ "$force" ]
then then
git-read-tree --reset -u $new git-read-tree --reset -u $new

9
t/t7201-co.sh
View File

@ -31,6 +31,15 @@ test_expect_success setup '
git checkout master git checkout master
' '


test_expect_success "checkout from non-existing branch" '

git checkout -b delete-me master &&
rm .git/refs/heads/delete-me &&
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
git checkout master &&
test refs/heads/master = "$(git symbolic-ref HEAD)"
'

test_expect_success "checkout with dirty tree without -m" ' test_expect_success "checkout with dirty tree without -m" '


fill 0 1 2 3 4 5 >one && fill 0 1 2 3 4 5 >one &&