[thirdparty/git.git] / t / t7201-co.sh

#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#

test_description='git checkout tests.

Creates master, forks renamer and side branches from it.
Test switching across them.

  ! [master] Initial A one, A two
   * [renamer] Renamer R one->uno, M two
    ! [side] Side M one, D two, A three
     ! [simple] Simple D one, M two
  ----
     + [simple] Simple D one, M two
    +  [side] Side M one, D two, A three
   *   [renamer] Renamer R one->uno, M two
  +*++ [master] Initial A one, A two

'

. ./test-lib.sh

test_tick

fill () {
	for i
	do
		echo "$i"
	done
}


test_expect_success setup '

	fill x y z > same &&
	fill 1 2 3 4 5 6 7 8 >one &&
	fill a b c d e >two &&
	git add same one two &&
	git commit -m "Initial A one, A two" &&

	git checkout -b renamer &&
	rm -f one &&
	fill 1 3 4 5 6 7 8 >uno &&
	git add uno &&
	fill a b c d e f >two &&
	git commit -a -m "Renamer R one->uno, M two" &&

	git checkout -b side master &&
	fill 1 2 3 4 5 6 7 >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 -b simple master &&
	rm -f one &&
	fill a c e > two &&
	git commit -a -m "Simple D one, M two" &&

	git checkout master
'

test_expect_success "checkout from non-existing branch" '

	git checkout -b delete-me master &&
	git update-ref -d --no-deref 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 6 7 8 >one &&
	if git checkout side
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi

'

test_expect_success "checkout with unrelated dirty tree without -m" '

	git checkout -f master &&
	fill 0 1 2 3 4 5 6 7 8 >same &&
	cp same kept &&
	git checkout side >messages &&
	test_cmp same kept &&
	printf "M\t%s\n" same >messages.expect &&
	test_cmp messages.expect messages
'

test_expect_success "checkout -m with dirty tree" '

	git checkout -f master &&
	git clean -f &&

	fill 0 1 2 3 4 5 6 7 8 >one &&
	git checkout -m side > messages &&

	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&

	printf "M\t%s\n" one >expect.messages &&
	test_cmp expect.messages messages &&

	fill "M	one" "A	three" "D	two" >expect.master &&
	git diff --name-status master >current.master &&
	test_cmp expect.master current.master &&

	fill "M	one" >expect.side &&
	git diff --name-status side >current.side &&
	test_cmp expect.side current.side &&

	git diff --cached >current.index &&
	test_must_be_empty current.index
'

test_expect_success "checkout -m with dirty tree, renamed" '

	git checkout -f master && git clean -f &&

	fill 1 2 3 4 5 7 8 >one &&
	if git checkout renamer
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi &&

	git checkout -m renamer &&
	fill 1 3 4 5 7 8 >expect &&
	test_cmp expect uno &&
	! test -f one &&
	git diff --cached >current &&
	test_must_be_empty current

'

test_expect_success 'checkout -m with merge conflict' '

	git checkout -f master && git clean -f &&

	fill 1 T 3 4 5 6 S 8 >one &&
	if git checkout renamer
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi &&

	git checkout -m renamer &&

	git diff master:one :3:uno |
	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
	fill d2 aT d7 aS >expect &&
	test_cmp expect current &&
	git diff --cached two >current &&
	test_must_be_empty current
'

test_expect_success 'format of merge conflict from checkout -m' '

	git checkout -f master && git clean -f &&

	fill b d > two &&
	git checkout -m simple &&

	git ls-files >current &&
	fill same two two two >expect &&
	test_cmp expect current &&

	cat <<-EOF >expect &&
	<<<<<<< simple
	a
	c
	e
	=======
	b
	d
	>>>>>>> local
	EOF
	test_cmp expect two
'

test_expect_success 'checkout --merge --conflict=diff3 <branch>' '

	git checkout -f master && git reset --hard && git clean -f &&

	fill b d > two &&
	git checkout --merge --conflict=diff3 simple &&

	cat <<-EOF >expect &&
	<<<<<<< simple
	a
	c
	e
	||||||| master
	a
	b
	c
	d
	e
	=======
	b
	d
	>>>>>>> local
	EOF
	test_cmp expect two
'

test_expect_success 'switch to another branch while carrying a deletion' '

	git checkout -f master && git reset --hard && git clean -f &&
	git rm two &&

	test_must_fail git checkout simple 2>errs &&
	test_i18ngrep overwritten errs &&

	git checkout --merge simple 2>errs &&
	test_i18ngrep ! overwritten errs &&
	git ls-files -u &&
	test_must_fail git cat-file -t :0:two &&
	test "$(git cat-file -t :1:two)" = blob &&
	test "$(git cat-file -t :2:two)" = blob &&
	test_must_fail git cat-file -t :3:two
'

test_expect_success 'checkout to detach HEAD (with advice declined)' '

	git config advice.detachedHead false &&
	git checkout -f renamer && git clean -f &&
	git checkout renamer^ 2>messages &&
	test_i18ngrep "HEAD is now at 7329388" messages &&
	test_line_count = 1 messages &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'

test_expect_success 'checkout to detach HEAD' '
	git config advice.detachedHead true &&
	git checkout -f renamer && git clean -f &&
	GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
	grep "HEAD is now at 7329388" messages &&
	test_line_count -gt 1 messages &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'

test_expect_success 'checkout to detach HEAD with branchname^' '

	git checkout -f master && git clean -f &&
	git checkout renamer^ &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'

test_expect_success 'checkout to detach HEAD with :/message' '

	git checkout -f master && git clean -f &&
	git checkout ":/Initial" &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'

test_expect_success 'checkout to detach HEAD with HEAD^0' '

	git checkout -f master && git clean -f &&
	git checkout HEAD^0 &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'

test_expect_success 'checkout with ambiguous tag/branch names' '

	git tag both side &&
	git branch both master &&
	git reset --hard &&
	git checkout master &&

	git checkout both &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	name=$(git symbolic-ref HEAD 2>/dev/null) &&
	test "z$name" = zrefs/heads/both

'

test_expect_success 'checkout with ambiguous tag/branch names' '

	git reset --hard &&
	git checkout master &&

	git tag frotz side &&
	git branch frotz master &&
	git reset --hard &&
	git checkout master &&

	git checkout tags/frotz &&
	H=$(git rev-parse --verify HEAD) &&
	S=$(git show-ref -s --verify refs/heads/side) &&
	test "z$H" = "z$S" &&
	if name=$(git symbolic-ref HEAD 2>/dev/null)
	then
		echo "Bad -- should have detached"
		false
	else
		: happy
	fi

'

test_expect_success 'switch branches while in subdirectory' '

	git reset --hard &&
	git checkout master &&

	mkdir subs &&
	(
		cd subs &&
		git checkout side
	) &&
	! test -f subs/one &&
	rm -fr subs

'

test_expect_success 'checkout specific path while in subdirectory' '

	git reset --hard &&
	git checkout side &&
	mkdir subs &&
	>subs/bero &&
	git add subs/bero &&
	git commit -m "add subs/bero" &&

	git checkout master &&
	mkdir -p subs &&
	(
		cd subs &&
		git checkout side -- bero
	) &&
	test -f subs/bero

'

test_expect_success \
    'checkout w/--track sets up tracking' '
    git config branch.autosetupmerge false &&
    git checkout master &&
    git checkout --track -b track1 &&
    test "$(git config branch.track1.remote)" &&
    test "$(git config branch.track1.merge)"'

test_expect_success \
    'checkout w/autosetupmerge=always sets up tracking' '
    test_when_finished git config branch.autosetupmerge false &&
    git config branch.autosetupmerge always &&
    git checkout master &&
    git checkout -b track2 &&
    test "$(git config branch.track2.remote)" &&
    test "$(git config branch.track2.merge)"'

test_expect_success 'checkout w/--track from non-branch HEAD fails' '
    git checkout master^0 &&
    test_must_fail git symbolic-ref HEAD &&
    test_must_fail git checkout --track -b track &&
    test_must_fail git rev-parse --verify track &&
    test_must_fail git symbolic-ref HEAD &&
    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
'

test_expect_success 'checkout w/--track from tag fails' '
    git checkout master^0 &&
    test_must_fail git symbolic-ref HEAD &&
    test_must_fail git checkout --track -b track frotz &&
    test_must_fail git rev-parse --verify track &&
    test_must_fail git symbolic-ref HEAD &&
    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
'

test_expect_success 'detach a symbolic link HEAD' '
    git checkout master &&
    git config --bool core.prefersymlinkrefs yes &&
    git checkout side &&
    git checkout master &&
    it=$(git symbolic-ref HEAD) &&
    test "z$it" = zrefs/heads/master &&
    here=$(git rev-parse --verify refs/heads/master) &&
    git checkout side^ &&
    test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
'

test_expect_success \
    'checkout with --track fakes a sensible -b <name>' '
    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
    git update-ref refs/remotes/origin/koala/bear renamer &&

    git checkout --track origin/koala/bear &&
    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&

    git checkout master && git branch -D koala/bear &&

    git checkout --track refs/remotes/origin/koala/bear &&
    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&

    git checkout master && git branch -D koala/bear &&

    git checkout --track remotes/origin/koala/bear &&
    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
'

test_expect_success \
    'checkout with --track, but without -b, fails with too short tracked name' '
    test_must_fail git checkout --track renamer'

setup_conflicting_index () {
	rm -f .git/index &&
	O=$(echo original | git hash-object -w --stdin) &&
	A=$(echo ourside | git hash-object -w --stdin) &&
	B=$(echo theirside | git hash-object -w --stdin) &&
	(
		echo "100644 $A 0	fild" &&
		echo "100644 $O 1	file" &&
		echo "100644 $A 2	file" &&
		echo "100644 $B 3	file" &&
		echo "100644 $A 0	filf"
	) | git update-index --index-info
}

test_expect_success 'checkout an unmerged path should fail' '
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	test_must_fail git checkout fild file filf &&
	test_cmp sample fild &&
	test_cmp sample filf &&
	test_cmp sample file
'

test_expect_success 'checkout with an unmerged path can be ignored' '
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout -f fild file filf &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp sample file
'

test_expect_success 'checkout unmerged stage' '
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout --ours . &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp expect file &&
	git checkout --theirs file &&
	test ztheirside = "z$(cat file)"
'

test_expect_success 'checkout with --merge' '
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout -m -- fild file filf &&
	(
		echo "<<<<<<< ours" &&
		echo ourside &&
		echo "=======" &&
		echo theirside &&
		echo ">>>>>>> theirs"
	) >merged &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp merged file
'

test_expect_success 'checkout with --merge, in diff3 -m style' '
	git config merge.conflictstyle diff3 &&
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout -m -- fild file filf &&
	(
		echo "<<<<<<< ours" &&
		echo ourside &&
		echo "||||||| base" &&
		echo original &&
		echo "=======" &&
		echo theirside &&
		echo ">>>>>>> theirs"
	) >merged &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp merged file
'

test_expect_success 'checkout --conflict=merge, overriding config' '
	git config merge.conflictstyle diff3 &&
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout --conflict=merge -- fild file filf &&
	(
		echo "<<<<<<< ours" &&
		echo ourside &&
		echo "=======" &&
		echo theirside &&
		echo ">>>>>>> theirs"
	) >merged &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp merged file
'

test_expect_success 'checkout --conflict=diff3' '
	test_unconfig merge.conflictstyle &&
	setup_conflicting_index &&
	echo "none of the above" >sample &&
	echo ourside >expect &&
	cat sample >fild &&
	cat sample >file &&
	cat sample >filf &&
	git checkout --conflict=diff3 -- fild file filf &&
	(
		echo "<<<<<<< ours" &&
		echo ourside &&
		echo "||||||| base" &&
		echo original &&
		echo "=======" &&
		echo theirside &&
		echo ">>>>>>> theirs"
	) >merged &&
	test_cmp expect fild &&
	test_cmp expect filf &&
	test_cmp merged file
'

test_expect_success 'failing checkout -b should not break working tree' '
	git reset --hard master &&
	git symbolic-ref HEAD refs/heads/master &&
	test_must_fail git checkout -b renamer side^ &&
	test $(git symbolic-ref HEAD) = refs/heads/master &&
	git diff --exit-code &&
	git diff --cached --exit-code

'

test_expect_success 'switch out of non-branch' '
	git reset --hard master &&
	git checkout master^0 &&
	echo modified >one &&
	test_must_fail git checkout renamer 2>error.log &&
	! grep "^Previous HEAD" error.log
'

(
 echo "#!$SHELL_PATH"
 cat <<\EOF
O=$1 A=$2 B=$3
cat "$A" >.tmp
exec >"$A"
echo '<<<<<<< filfre-theirs'
cat "$B"
echo '||||||| filfre-common'
cat "$O"
echo '======='
cat ".tmp"
echo '>>>>>>> filfre-ours'
rm -f .tmp
exit 1
EOF
) >filfre.sh
chmod +x filfre.sh

test_expect_success 'custom merge driver with checkout -m' '
	git reset --hard &&

	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
	git config merge.filfre.name "Feel-free merge driver" &&
	git config merge.filfre.recursive binary &&
	echo "arm merge=filfre" >.gitattributes &&

	git checkout -b left &&
	echo neutral >arm &&
	git add arm .gitattributes &&
	test_tick &&
	git commit -m neutral &&
	git branch right &&

	echo left >arm &&
	test_tick &&
	git commit -a -m left &&
	git checkout right &&

	echo right >arm &&
	test_tick &&
	git commit -a -m right &&

	test_must_fail git merge left &&
	(
		for t in filfre-common left right
		do
			grep $t arm || exit 1
		done
	) &&

	mv arm expect &&
	git checkout -m arm &&
	test_cmp expect arm
'

test_done
Commit	Line	Data
abc02670 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Junio C Hamano
	4	#
	5
47a528ad	6	test_description='git checkout tests.
3e0318a3 JH	7
	8	Creates master, forks renamer and side branches from it.
	9	Test switching across them.
	10
	11	! [master] Initial A one, A two
	12	* [renamer] Renamer R one->uno, M two
	13	! [side] Side M one, D two, A three
47349a8c JN	14	! [simple] Simple D one, M two
	15	----
	16	+ [simple] Simple D one, M two
	17	+ [side] Side M one, D two, A three
	18	* [renamer] Renamer R one->uno, M two
	19	+*++ [master] Initial A one, A two
3e0318a3 JH	20
3e0318a3 JH	21	'
abc02670 JH	22
	23	. ./test-lib.sh
	24
c07c7bf6 DB	25	test_tick
c07c7bf6 DB	26
abc02670 JH	27	fill () {
	28	for i
	29	do
	30	echo "$i"
	31	done
	32	}
	33
c1a4278e	34
abc02670 JH	35	test_expect_success setup '
abc02670 JH	36
c07c7bf6	37	fill x y z > same &&
c1a4278e	38	fill 1 2 3 4 5 6 7 8 >one &&
abc02670	39	fill a b c d e >two &&
c07c7bf6	40	git add same one two &&
abc02670 JH	41	git commit -m "Initial A one, A two" &&
abc02670 JH	42
c1a4278e JH	43	git checkout -b renamer &&
	44	rm -f one &&
	45	fill 1 3 4 5 6 7 8 >uno &&
	46	git add uno &&
	47	fill a b c d e f >two &&
	48	git commit -a -m "Renamer R one->uno, M two" &&
	49
	50	git checkout -b side master &&
	51	fill 1 2 3 4 5 6 7 >one &&
abc02670 JH	52	fill A B C D E >three &&
	53	rm -f two &&
	54	git update-index --add --remove one two three &&
	55	git commit -m "Side M one, D two, A three" &&
	56
47349a8c JN	57	git checkout -b simple master &&
	58	rm -f one &&
	59	fill a c e > two &&
	60	git commit -a -m "Simple D one, M two" &&
	61
abc02670 JH	62	git checkout master
	63	'
	64
5a03e7f2 SP	65	test_expect_success "checkout from non-existing branch" '
	66
	67	git checkout -b delete-me master &&
cbc5cf7c	68	git update-ref -d --no-deref refs/heads/delete-me &&
5a03e7f2 SP	69	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
	70	git checkout master &&
	71	test refs/heads/master = "$(git symbolic-ref HEAD)"
	72	'
	73
abc02670 JH	74	test_expect_success "checkout with dirty tree without -m" '
abc02670 JH	75
c1a4278e	76	fill 0 1 2 3 4 5 6 7 8 >one &&
abc02670 JH	77	if git checkout side
	78	then
	79	echo Not happy
	80	false
	81	else
	82	echo "happy - failed correctly"
	83	fi
	84
	85	'
	86
c07c7bf6 DB	87	test_expect_success "checkout with unrelated dirty tree without -m" '
	88
	89	git checkout -f master &&
	90	fill 0 1 2 3 4 5 6 7 8 >same &&
aef591a0	91	cp same kept &&
c07c7bf6	92	git checkout side >messages &&
aef591a0 JK	93	test_cmp same kept &&
aef591a0 JK	94	printf "M\t%s\n" same >messages.expect &&
82ebb0b6	95	test_cmp messages.expect messages
c07c7bf6 DB	96	'
c07c7bf6 DB	97
abc02670 JH	98	test_expect_success "checkout -m with dirty tree" '
	99
	100	git checkout -f master &&
562ca192	101	git clean -f &&
abc02670	102
c1a4278e	103	fill 0 1 2 3 4 5 6 7 8 >one &&
c07c7bf6	104	git checkout -m side > messages &&
abc02670	105
c1a4278e	106	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
abc02670	107
aef591a0	108	printf "M\t%s\n" one >expect.messages &&
82ebb0b6	109	test_cmp expect.messages messages &&
c07c7bf6	110
abc02670 JH	111	fill "M one" "A three" "D two" >expect.master &&
abc02670 JH	112	git diff --name-status master >current.master &&
82ebb0b6	113	test_cmp expect.master current.master &&
abc02670 JH	114
	115	fill "M one" >expect.side &&
	116	git diff --name-status side >current.side &&
82ebb0b6	117	test_cmp expect.side current.side &&
abc02670	118
abc02670	119	git diff --cached >current.index &&
1c5e94f4	120	test_must_be_empty current.index
abc02670 JH	121	'
abc02670 JH	122
c1a4278e JH	123	test_expect_success "checkout -m with dirty tree, renamed" '
c1a4278e JH	124
562ca192	125	git checkout -f master && git clean -f &&
c1a4278e JH	126
	127	fill 1 2 3 4 5 7 8 >one &&
	128	if git checkout renamer
	129	then
	130	echo Not happy
	131	false
	132	else
	133	echo "happy - failed correctly"
	134	fi &&
	135
	136	git checkout -m renamer &&
	137	fill 1 3 4 5 7 8 >expect &&
82ebb0b6	138	test_cmp expect uno &&
d7ebd53d JH	139	! test -f one &&
d7ebd53d JH	140	git diff --cached >current &&
ec10b018	141	test_must_be_empty current
d7ebd53d JH	142
	143	'
	144
	145	test_expect_success 'checkout -m with merge conflict' '
	146
562ca192	147	git checkout -f master && git clean -f &&
d7ebd53d JH	148
	149	fill 1 T 3 4 5 6 S 8 >one &&
	150	if git checkout renamer
	151	then
	152	echo Not happy
	153	false
	154	else
	155	echo "happy - failed correctly"
	156	fi &&
	157
	158	git checkout -m renamer &&
	159
	160	git diff master:one :3:uno \|
	161	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
	162	fill d2 aT d7 aS >expect &&
dcbaa0b3	163	test_cmp expect current &&
d7ebd53d	164	git diff --cached two >current &&
ec10b018	165	test_must_be_empty current
c1a4278e JH	166	'
c1a4278e JH	167
47349a8c JN	168	test_expect_success 'format of merge conflict from checkout -m' '
	169
	170	git checkout -f master && git clean -f &&
	171
	172	fill b d > two &&
	173	git checkout -m simple &&
	174
	175	git ls-files >current &&
	176	fill same two two two >expect &&
dcbaa0b3	177	test_cmp expect current &&
47349a8c JN	178
	179	cat <<-EOF >expect &&
	180	<<<<<<< simple
	181	a
	182	c
	183	e
	184	=======
	185	b
	186	d
	187	>>>>>>> local
	188	EOF
9c5b2fab	189	test_cmp expect two
47349a8c JN	190	'
	191
	192	test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
	193
	194	git checkout -f master && git reset --hard && git clean -f &&
	195
	196	fill b d > two &&
	197	git checkout --merge --conflict=diff3 simple &&
	198
	199	cat <<-EOF >expect &&
	200	<<<<<<< simple
	201	a
	202	c
	203	e
c4151629	204	\|\|\|\|\|\|\| master
47349a8c JN	205	a
	206	b
	207	c
	208	d
	209	e
	210	=======
	211	b
	212	d
	213	>>>>>>> local
	214	EOF
9c5b2fab	215	test_cmp expect two
47349a8c JN	216	'
47349a8c JN	217
6a143aa2 JN	218	test_expect_success 'switch to another branch while carrying a deletion' '
	219
	220	git checkout -f master && git reset --hard && git clean -f &&
	221	git rm two &&
	222
	223	test_must_fail git checkout simple 2>errs &&
	224	test_i18ngrep overwritten errs &&
	225
	226	git checkout --merge simple 2>errs &&
	227	test_i18ngrep ! overwritten errs &&
	228	git ls-files -u &&
	229	test_must_fail git cat-file -t :0:two &&
	230	test "$(git cat-file -t :1:two)" = blob &&
	231	test "$(git cat-file -t :2:two)" = blob &&
	232	test_must_fail git cat-file -t :3:two
	233	'
	234
69382976	235	test_expect_success 'checkout to detach HEAD (with advice declined)' '
3e0318a3	236
13be3e31	237	git config advice.detachedHead false &&
562ca192	238	git checkout -f renamer && git clean -f &&
c07c7bf6	239	git checkout renamer^ 2>messages &&
69382976	240	test_i18ngrep "HEAD is now at 7329388" messages &&
3fb0459b	241	test_line_count = 1 messages &&
13be3e31 JH	242	H=$(git rev-parse --verify HEAD) &&
	243	M=$(git show-ref -s --verify refs/heads/master) &&
	244	test "z$H" = "z$M" &&
	245	if git symbolic-ref HEAD >/dev/null 2>&1
	246	then
	247	echo "OOPS, HEAD is still symbolic???"
	248	false
	249	else
	250	: happy
	251	fi
	252	'
	253
69382976	254	test_expect_success 'checkout to detach HEAD' '
13be3e31 JH	255	git config advice.detachedHead true &&
13be3e31 JH	256	git checkout -f renamer && git clean -f &&
6cdccfce ÆAB	257	GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
	258	grep "HEAD is now at 7329388" messages &&
	259	test_line_count -gt 1 messages &&
3e0318a3 JH	260	H=$(git rev-parse --verify HEAD) &&
	261	M=$(git show-ref -s --verify refs/heads/master) &&
	262	test "z$H" = "z$M" &&
	263	if git symbolic-ref HEAD >/dev/null 2>&1
	264	then
	265	echo "OOPS, HEAD is still symbolic???"
	266	false
	267	else
	268	: happy
	269	fi
	270	'
	271
69382976	272	test_expect_success 'checkout to detach HEAD with branchname^' '
3e0318a3	273
562ca192	274	git checkout -f master && git clean -f &&
3e0318a3 JH	275	git checkout renamer^ &&
	276	H=$(git rev-parse --verify HEAD) &&
	277	M=$(git show-ref -s --verify refs/heads/master) &&
	278	test "z$H" = "z$M" &&
	279	if git symbolic-ref HEAD >/dev/null 2>&1
	280	then
	281	echo "OOPS, HEAD is still symbolic???"
	282	false
	283	else
	284	: happy
	285	fi
	286	'
	287
69382976	288	test_expect_success 'checkout to detach HEAD with :/message' '
b1e9efa7 DB	289
	290	git checkout -f master && git clean -f &&
	291	git checkout ":/Initial" &&
	292	H=$(git rev-parse --verify HEAD) &&
	293	M=$(git show-ref -s --verify refs/heads/master) &&
	294	test "z$H" = "z$M" &&
	295	if git symbolic-ref HEAD >/dev/null 2>&1
	296	then
	297	echo "OOPS, HEAD is still symbolic???"
	298	false
	299	else
	300	: happy
	301	fi
	302	'
	303
69382976	304	test_expect_success 'checkout to detach HEAD with HEAD^0' '
3e0318a3	305
562ca192	306	git checkout -f master && git clean -f &&
3e0318a3 JH	307	git checkout HEAD^0 &&
	308	H=$(git rev-parse --verify HEAD) &&
	309	M=$(git show-ref -s --verify refs/heads/master) &&
	310	test "z$H" = "z$M" &&
	311	if git symbolic-ref HEAD >/dev/null 2>&1
	312	then
	313	echo "OOPS, HEAD is still symbolic???"
	314	false
	315	else
	316	: happy
	317	fi
	318	'
	319
5035242c JH	320	test_expect_success 'checkout with ambiguous tag/branch names' '
	321
	322	git tag both side &&
	323	git branch both master &&
	324	git reset --hard &&
	325	git checkout master &&
	326
	327	git checkout both &&
	328	H=$(git rev-parse --verify HEAD) &&
	329	M=$(git show-ref -s --verify refs/heads/master) &&
	330	test "z$H" = "z$M" &&
	331	name=$(git symbolic-ref HEAD 2>/dev/null) &&
	332	test "z$name" = zrefs/heads/both
	333
	334	'
	335
	336	test_expect_success 'checkout with ambiguous tag/branch names' '
	337
	338	git reset --hard &&
	339	git checkout master &&
	340
	341	git tag frotz side &&
	342	git branch frotz master &&
	343	git reset --hard &&
	344	git checkout master &&
	345
	346	git checkout tags/frotz &&
	347	H=$(git rev-parse --verify HEAD) &&
	348	S=$(git show-ref -s --verify refs/heads/side) &&
	349	test "z$H" = "z$S" &&
	350	if name=$(git symbolic-ref HEAD 2>/dev/null)
	351	then
	352	echo "Bad -- should have detached"
	353	false
	354	else
	355	: happy
	356	fi
	357
	358	'
	359
6010d2d9 JH	360	test_expect_success 'switch branches while in subdirectory' '
	361
	362	git reset --hard &&
	363	git checkout master &&
	364
	365	mkdir subs &&
	366	(
	367	cd subs &&
	368	git checkout side
	369	) &&
	370	! test -f subs/one &&
	371	rm -fr subs
	372
	373	'
	374
	375	test_expect_success 'checkout specific path while in subdirectory' '
	376
	377	git reset --hard &&
	378	git checkout side &&
	379	mkdir subs &&
	380	>subs/bero &&
	381	git add subs/bero &&
	382	git commit -m "add subs/bero" &&
	383
	384	git checkout master &&
	385	mkdir -p subs &&
	386	(
	387	cd subs &&
	388	git checkout side -- bero
	389	) &&
	390	test -f subs/bero
	391
	392	'
	393
9ed36cfa JS	394	test_expect_success \
	395	'checkout w/--track sets up tracking' '
	396	git config branch.autosetupmerge false &&
	397	git checkout master &&
	398	git checkout --track -b track1 &&
	399	test "$(git config branch.track1.remote)" &&
	400	test "$(git config branch.track1.merge)"'
	401
	402	test_expect_success \
	403	'checkout w/autosetupmerge=always sets up tracking' '
aef591a0	404	test_when_finished git config branch.autosetupmerge false &&
9ed36cfa JS	405	git config branch.autosetupmerge always &&
	406	git checkout master &&
	407	git checkout -b track2 &&
	408	test "$(git config branch.track2.remote)" &&
aef591a0	409	test "$(git config branch.track2.merge)"'
9ed36cfa	410
51a94af8 JH	411	test_expect_success 'checkout w/--track from non-branch HEAD fails' '
	412	git checkout master^0 &&
	413	test_must_fail git symbolic-ref HEAD &&
	414	test_must_fail git checkout --track -b track &&
	415	test_must_fail git rev-parse --verify track &&
	416	test_must_fail git symbolic-ref HEAD &&
	417	test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
	418	'
9ed36cfa	419
21b5b1e8 JH	420	test_expect_success 'checkout w/--track from tag fails' '
	421	git checkout master^0 &&
	422	test_must_fail git symbolic-ref HEAD &&
	423	test_must_fail git checkout --track -b track frotz &&
	424	test_must_fail git rev-parse --verify track &&
	425	test_must_fail git symbolic-ref HEAD &&
	426	test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
	427	'
	428
acd3b9ec	429	test_expect_success 'detach a symbolic link HEAD' '
f5637549 JH	430	git checkout master &&
	431	git config --bool core.prefersymlinkrefs yes &&
	432	git checkout side &&
	433	git checkout master &&
	434	it=$(git symbolic-ref HEAD) &&
	435	test "z$it" = zrefs/heads/master &&
	436	here=$(git rev-parse --verify refs/heads/master) &&
	437	git checkout side^ &&
	438	test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
	439	'
9ed36cfa	440
bb0ceb62 JS	441	test_expect_success \
bb0ceb62 JS	442	'checkout with --track fakes a sensible -b <name>' '
88a9f72f	443	git config remote.origin.fetch "+refs/heads/:refs/remotes/origin/" &&
bb0ceb62	444	git update-ref refs/remotes/origin/koala/bear renamer &&
9188ed89	445
bb0ceb62 JS	446	git checkout --track origin/koala/bear &&
bb0ceb62 JS	447	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
9188ed89 AR	448	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
	449
	450	git checkout master && git branch -D koala/bear &&
	451
	452	git checkout --track refs/remotes/origin/koala/bear &&
	453	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
	454	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
	455
	456	git checkout master && git branch -D koala/bear &&
	457
	458	git checkout --track remotes/origin/koala/bear &&
	459	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
9188ed89 AR	460	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
9188ed89 AR	461	'
bb0ceb62 JS	462
	463	test_expect_success \
	464	'checkout with --track, but without -b, fails with too short tracked name' '
	465	test_must_fail git checkout --track renamer'
	466
eac5a401	467	setup_conflicting_index () {
8fdcf312 JH	468	rm -f .git/index &&
	469	O=$(echo original \| git hash-object -w --stdin) &&
	470	A=$(echo ourside \| git hash-object -w --stdin) &&
	471	B=$(echo theirside \| git hash-object -w --stdin) &&
	472	(
	473	echo "100644 $A 0 fild" &&
	474	echo "100644 $O 1 file" &&
	475	echo "100644 $A 2 file" &&
	476	echo "100644 $B 3 file" &&
	477	echo "100644 $A 0 filf"
eac5a401 JH	478	) \| git update-index --index-info
	479	}
	480
	481	test_expect_success 'checkout an unmerged path should fail' '
	482	setup_conflicting_index &&
8fdcf312 JH	483	echo "none of the above" >sample &&
	484	cat sample >fild &&
	485	cat sample >file &&
	486	cat sample >filf &&
	487	test_must_fail git checkout fild file filf &&
	488	test_cmp sample fild &&
	489	test_cmp sample filf &&
	490	test_cmp sample file
	491	'
	492
db941099	493	test_expect_success 'checkout with an unmerged path can be ignored' '
eac5a401	494	setup_conflicting_index &&
db941099 JH	495	echo "none of the above" >sample &&
	496	echo ourside >expect &&
	497	cat sample >fild &&
	498	cat sample >file &&
	499	cat sample >filf &&
	500	git checkout -f fild file filf &&
	501	test_cmp expect fild &&
	502	test_cmp expect filf &&
	503	test_cmp sample file
	504	'
	505
38901a48	506	test_expect_success 'checkout unmerged stage' '
eac5a401	507	setup_conflicting_index &&
38901a48 JH	508	echo "none of the above" >sample &&
	509	echo ourside >expect &&
	510	cat sample >fild &&
	511	cat sample >file &&
	512	cat sample >filf &&
	513	git checkout --ours . &&
	514	test_cmp expect fild &&
	515	test_cmp expect filf &&
	516	test_cmp expect file &&
	517	git checkout --theirs file &&
	518	test ztheirside = "z$(cat file)"
	519	'
	520
0cf8581e	521	test_expect_success 'checkout with --merge' '
eac5a401	522	setup_conflicting_index &&
0cf8581e JH	523	echo "none of the above" >sample &&
	524	echo ourside >expect &&
	525	cat sample >fild &&
	526	cat sample >file &&
	527	cat sample >filf &&
	528	git checkout -m -- fild file filf &&
	529	(
e974e06d ES	530	echo "<<<<<<< ours" &&
	531	echo ourside &&
	532	echo "=======" &&
	533	echo theirside &&
0cf8581e JH	534	echo ">>>>>>> theirs"
	535	) >merged &&
	536	test_cmp expect fild &&
	537	test_cmp expect filf &&
	538	test_cmp merged file
	539	'
	540
	541	test_expect_success 'checkout with --merge, in diff3 -m style' '
	542	git config merge.conflictstyle diff3 &&
eac5a401	543	setup_conflicting_index &&
0cf8581e JH	544	echo "none of the above" >sample &&
	545	echo ourside >expect &&
	546	cat sample >fild &&
	547	cat sample >file &&
	548	cat sample >filf &&
	549	git checkout -m -- fild file filf &&
	550	(
e974e06d ES	551	echo "<<<<<<< ours" &&
	552	echo ourside &&
	553	echo "\|\|\|\|\|\|\| base" &&
	554	echo original &&
	555	echo "=======" &&
	556	echo theirside &&
0cf8581e JH	557	echo ">>>>>>> theirs"
	558	) >merged &&
	559	test_cmp expect fild &&
	560	test_cmp expect filf &&
	561	test_cmp merged file
	562	'
	563
eac5a401 JH	564	test_expect_success 'checkout --conflict=merge, overriding config' '
	565	git config merge.conflictstyle diff3 &&
	566	setup_conflicting_index &&
	567	echo "none of the above" >sample &&
	568	echo ourside >expect &&
	569	cat sample >fild &&
	570	cat sample >file &&
	571	cat sample >filf &&
	572	git checkout --conflict=merge -- fild file filf &&
	573	(
e974e06d ES	574	echo "<<<<<<< ours" &&
	575	echo ourside &&
	576	echo "=======" &&
	577	echo theirside &&
eac5a401 JH	578	echo ">>>>>>> theirs"
	579	) >merged &&
	580	test_cmp expect fild &&
	581	test_cmp expect filf &&
	582	test_cmp merged file
	583	'
	584
	585	test_expect_success 'checkout --conflict=diff3' '
a6a4a88a	586	test_unconfig merge.conflictstyle &&
eac5a401 JH	587	setup_conflicting_index &&
	588	echo "none of the above" >sample &&
	589	echo ourside >expect &&
	590	cat sample >fild &&
	591	cat sample >file &&
	592	cat sample >filf &&
	593	git checkout --conflict=diff3 -- fild file filf &&
	594	(
e974e06d ES	595	echo "<<<<<<< ours" &&
	596	echo ourside &&
	597	echo "\|\|\|\|\|\|\| base" &&
	598	echo original &&
	599	echo "=======" &&
	600	echo theirside &&
eac5a401 JH	601	echo ">>>>>>> theirs"
	602	) >merged &&
	603	test_cmp expect fild &&
	604	test_cmp expect filf &&
	605	test_cmp merged file
	606	'
	607
352eadc4 DB	608	test_expect_success 'failing checkout -b should not break working tree' '
	609	git reset --hard master &&
	610	git symbolic-ref HEAD refs/heads/master &&
	611	test_must_fail git checkout -b renamer side^ &&
	612	test $(git symbolic-ref HEAD) = refs/heads/master &&
	613	git diff --exit-code &&
	614	git diff --cached --exit-code
	615
	616	'
	617
e4b09dad NS	618	test_expect_success 'switch out of non-branch' '
	619	git reset --hard master &&
	620	git checkout master^0 &&
	621	echo modified >one &&
	622	test_must_fail git checkout renamer 2>error.log &&
	623	! grep "^Previous HEAD" error.log
	624	'
	625
6d6f9acc JH	626	(
	627	echo "#!$SHELL_PATH"
	628	cat <<\EOF
	629	O=$1 A=$2 B=$3
	630	cat "$A" >.tmp
	631	exec >"$A"
	632	echo '<<<<<<< filfre-theirs'
	633	cat "$B"
	634	echo '\|\|\|\|\|\|\| filfre-common'
	635	cat "$O"
	636	echo '======='
	637	cat ".tmp"
	638	echo '>>>>>>> filfre-ours'
	639	rm -f .tmp
	640	exit 1
	641	EOF
	642	) >filfre.sh
	643	chmod +x filfre.sh
	644
	645	test_expect_success 'custom merge driver with checkout -m' '
	646	git reset --hard &&
	647
	648	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
	649	git config merge.filfre.name "Feel-free merge driver" &&
	650	git config merge.filfre.recursive binary &&
	651	echo "arm merge=filfre" >.gitattributes &&
	652
	653	git checkout -b left &&
	654	echo neutral >arm &&
	655	git add arm .gitattributes &&
	656	test_tick &&
	657	git commit -m neutral &&
	658	git branch right &&
	659
	660	echo left >arm &&
	661	test_tick &&
	662	git commit -a -m left &&
	663	git checkout right &&
	664
	665	echo right >arm &&
	666	test_tick &&
	667	git commit -a -m right &&
	668
	669	test_must_fail git merge left &&
	670	(
	671	for t in filfre-common left right
	672	do
	673	grep $t arm \|\| exit 1
	674	done
6d6f9acc JH	675	) &&
	676
	677	mv arm expect &&
	678	git checkout -m arm &&
	679	test_cmp expect arm
	680	'
	681
abc02670	682	test_done