mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
5a03e7f253
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>
81 lines
1.5 KiB
Bash
Executable file
81 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='git-checkout tests.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
fill () {
|
|
for i
|
|
do
|
|
echo "$i"
|
|
done
|
|
}
|
|
|
|
test_expect_success setup '
|
|
|
|
fill 1 2 3 4 5 >one &&
|
|
fill a b c d e >two &&
|
|
git add one two &&
|
|
git commit -m "Initial A one, A two" &&
|
|
|
|
git checkout -b side &&
|
|
fill 1 2 3 >one &&
|
|
fill A B C D E >three &&
|
|
rm -f two &&
|
|
git update-index --add --remove one two three &&
|
|
git commit -m "Side M one, D two, A three" &&
|
|
|
|
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 &&
|
|
if git checkout side
|
|
then
|
|
echo Not happy
|
|
false
|
|
else
|
|
echo "happy - failed correctly"
|
|
fi
|
|
|
|
'
|
|
|
|
test_expect_success "checkout -m with dirty tree" '
|
|
|
|
git checkout -f master &&
|
|
git clean &&
|
|
|
|
fill 0 1 2 3 4 5 >one &&
|
|
git checkout -m side &&
|
|
|
|
fill " master" "* side" >expect.branch &&
|
|
git branch >current.branch &&
|
|
diff expect.branch current.branch &&
|
|
|
|
fill "M one" "A three" "D two" >expect.master &&
|
|
git diff --name-status master >current.master &&
|
|
diff expect.master current.master &&
|
|
|
|
fill "M one" >expect.side &&
|
|
git diff --name-status side >current.side &&
|
|
diff expect.side current.side &&
|
|
|
|
: >expect.index &&
|
|
git diff --cached >current.index &&
|
|
diff expect.index current.index
|
|
'
|
|
|
|
test_done
|