summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-09-25 05:24:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-27 07:43:50 (GMT)
commit5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f (patch)
treefff03fbd7d75adef66d4b1cc4f7cd04b4edfe2d0 /git-checkout.sh
parent4a0641b7cf833644b286b56bb57d66b5538e4418 (diff)
downloadgit-5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f.zip
git-5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f.tar.gz
git-5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f.tar.bz2
Allow git-checkout when on a non-existant branch.
I've seen some users get into situtations where their HEAD symbolic-ref is pointing at a non-existant ref. (Sometimes this happens during clone when the remote repository lacks a 'master' branch.) If this happens the user is unable to use git-checkout to switch branches as there is no prior commit to merge from. So instead of giving the user low-level errors about how HEAD can't be resolved and how not a single revision was given change the type of checkout to be a force and go through with the user's request anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 580a9e8..dd47724 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -4,8 +4,8 @@ USAGE='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
SUBDIRECTORY_OK=Sometimes
. git-sh-setup
-old=$(git-rev-parse HEAD)
old_name=HEAD
+old=$(git-rev-parse --verify $old_name 2>/dev/null)
new=
new_name=
force=
@@ -139,6 +139,13 @@ fi
die "git checkout: to checkout the requested commit you need to specify
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" ]
then
git-read-tree --reset -u $new