global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  detached HEAD -- finishing touches
This commit is contained in:
Junio C Hamano
2007-02-01 01:20:32 -08:00
parent 0f3cf8797c e4b0e4ab8e
commit 89855997dc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git-checkout.sh
View File

@@ -155,7 +155,7 @@ then
detached="$new"
if test -n "$oldbranch"
then
detach_warn="Note: you are not on ANY branch anymore.
detach_warn="Note: you are not on any branch and are at commit \"$new_name\"
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>"
@@ -235,7 +235,7 @@ else
saved_err=$?
if test "$saved_err" = 0
then
test "$new" = "$old" || git diff-index --name-status "$new"
git diff-index --name-status "$new"
fi
(exit $saved_err)
fi
@@ -258,6 +258,12 @@ if [ "$?" -eq 0 ]; then
if test -n "$branch"
then
GIT_DIR="$GIT_DIR" git-symbolic-ref -m "checkout: moving to $branch" HEAD "refs/heads/$branch"
if test -n "$newbranch"
then
echo >&2 "Switched to a new branch \"$branch\""
else
echo >&2 "Switched to branch \"$branch\""
fi
elif test -n "$detached"
then
# NEEDSWORK: we would want a command to detach the HEAD