aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-09-25 01:24:38 -0400
committerJunio C Hamano <junkio@cox.net>2006-09-27 00:43:50 -0700
commit5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f (patch)
treefff03fbd7d75adef66d4b1cc4f7cd04b4edfe2d0 /t
parent4a0641b7cf833644b286b56bb57d66b5538e4418 (diff)
downloadgit-5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f.tar.gz
git-5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f.tar.xz
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 't')
-rwxr-xr-xt/t7201-co.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index b64e8b7d7..085d4a096 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -31,6 +31,15 @@ test_expect_success setup '
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" '
fill 0 1 2 3 4 5 >one &&