[PATCH 2/2] Let git-checkout always drop any detached head

Nicolas Pitre· Feb 4, 2007, 02:50 UTC · lore

We used to refuse leaving a detached HEAD when it wasn't matching an existing ref so not to lose any commit that might have been performed while not on any branch (unless -f was provided).

But this protection was completely bogus since it was still possible to move to HEAD^ while still remaining detached but losing the last commit anyway if there was one.

Now that we have a proper reflog for HEAD it is best to simply remove that bogus (and admitedly annoying) protection and simply display the last HEAD position instead. If one wants to recover a lost detached state then it can be retrieved from the HEAD reflog.

Signed-off-by: Nicolas Pitre <nico@cam.org>
---
 git-checkout.sh |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

Show changes to git-checkout.sh +2 −15

diff --git a/git-checkout.sh b/git-checkout.sh
index 99b8779..e4cce06 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -164,22 +164,9 @@ 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" && test -n "$branch"
+elif test -z "$oldbranch" && && test -z "$quiet"
 then
-	# Coming back...
-	if test -z "$force"
-	then
-		git show-ref -d -s | grep "$old" >/dev/null || {
-			echo >&2 \
-"You are not on any branch and switching to branch '$new_name'
-may lose your changes.  At this point, you can do one of two things:
- (1) Decide it is Ok and say 'git checkout -f $new_name';
- (2) Start a new branch from the current commit, by saying
-     'git checkout -b <branch-name>'.
-Leaving your HEAD detached; not switching to branch '$new_name'."
-			exit 1;
-		}
-	fi
+	echo >&2 "Previous HEAD position was $old"
 fi
 
 if [ "X$old" = X ]

-- 
1.5.0.rc2.651.g3924-dirty

Nicolas Pitre· Feb 4, 2007, 02:58 UTC · re: Nicolas Pitre · lore

Re: [PATCH 2/2] Let git-checkout always drop any detached head

OK obviously I can't send proper patches today.

On Sat, 3 Feb 2007, Nicolas Pitre wrote:

Show 10 quoted lines

> diff --git a/git-checkout.sh b/git-checkout.sh
> index 99b8779..e4cce06 100755
> --- a/git-checkout.sh
> +++ b/git-checkout.sh
> @@ -164,22 +164,9 @@ 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" && test -n "$branch"
> +elif test -z "$oldbranch" && && test -z "$quiet"

Of course there is one "&&" too many.

Nicolas

patch, 2 partsLet git-checkout always drop any detached head