[git] / t / t3030-merge-recursive.sh

#!/bin/sh

test_description='merge-recursive backend test'

. ./test-lib.sh

test_expect_success 'setup 1' '

	echo hello >a &&
	o0=$(git hash-object a) &&
	cp a b &&
	cp a c &&
	mkdir d &&
	cp a d/e &&

	test_tick &&
	git add a b c d/e &&
	git commit -m initial &&
	c0=$(git rev-parse --verify HEAD) &&
	git branch side &&
	git branch df-1 &&
	git branch df-2 &&
	git branch df-3 &&
	git branch remove &&
	git branch submod &&
	git branch copy &&
	git branch rename &&
	git branch rename-ln &&

	echo hello >>a &&
	cp a d/e &&
	o1=$(git hash-object a) &&

	git add a d/e &&

	test_tick &&
	git commit -m "master modifies a and d/e" &&
	c1=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o1	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o1	d/e"
		echo "100644 $o1 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'setup 2' '

	rm -rf [abcd] &&
	git checkout side &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	echo goodbye >>a &&
	o2=$(git hash-object a) &&

	git add a &&

	test_tick &&
	git commit -m "side modifies a" &&
	c2=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o2	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o2 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'setup 3' '

	rm -rf [abcd] &&
	git checkout df-1 &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
	o3=$(git hash-object b/c) &&

	test_tick &&
	git commit -m "df-1 makes b/c" &&
	c3=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o3	b/c"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o3 0	b/c"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'setup 4' '

	rm -rf [abcd] &&
	git checkout df-2 &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
	o4=$(git hash-object a/c) &&

	test_tick &&
	git commit -m "df-2 makes a/c" &&
	c4=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o4	a/c"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o4 0	a/c"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'setup 5' '

	rm -rf [abcd] &&
	git checkout remove &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	rm -f b &&
	echo remove-conflict >a &&

	git add a &&
	git rm b &&
	o5=$(git hash-object a) &&

	test_tick &&
	git commit -m "remove removes b and modifies a" &&
	c5=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o5	a"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o5 0	a"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'setup 6' '

	rm -rf [abcd] &&
	git checkout df-3 &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	rm -fr d && echo df-3 >d && git add d &&
	o6=$(git hash-object d) &&

	test_tick &&
	git commit -m "df-3 makes d" &&
	c6=$(git rev-parse --verify HEAD) &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o6	d"
		echo "100644 $o0 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o6 0	d"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'setup 7' '

	git checkout submod &&
	git rm d/e &&
	test_tick &&
	git commit -m "remove d/e" &&
	git update-index --add --cacheinfo 160000 $c1 d &&
	test_tick &&
	git commit -m "make d/ a submodule"
'

test_expect_success 'setup 8' '
	git checkout rename &&
	git mv a e &&
	git add e &&
	test_tick &&
	git commit -m "rename a->e" &&
	c7=$(git rev-parse --verify HEAD) &&
	git checkout rename-ln &&
	git mv a e &&
	test_ln_s_add e a &&
	test_tick &&
	git commit -m "rename a->e, symlink a->e" &&
	oln=`printf e | git hash-object --stdin`
'

test_expect_success 'setup 9' '
	git checkout copy &&
	cp a e &&
	git add e &&
	test_tick &&
	git commit -m "copy a->e"
'

test_expect_success 'merge-recursive simple' '

	rm -fr [abcd] &&
	git checkout -f "$c2" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
'

test_expect_success 'merge-recursive result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o0 1	a"
		echo "100644 $o2 2	a"
		echo "100644 $o1 3	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'fail if the index has unresolved entries' '

	rm -fr [abcd] &&
	git checkout -f "$c1" &&

	test_must_fail git merge "$c5" &&
	test_must_fail git merge "$c5" 2> out &&
	test_i18ngrep "not possible because you have unmerged files" out &&
	git add -u &&
	test_must_fail git merge "$c5" 2> out &&
	test_i18ngrep "You have not concluded your merge" out &&
	rm -f .git/MERGE_HEAD &&
	test_must_fail git merge "$c5" 2> out &&
	test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
'

test_expect_success 'merge-recursive remove conflict' '

	rm -fr [abcd] &&
	git checkout -f "$c1" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
'

test_expect_success 'merge-recursive remove conflict' '

	git ls-files -s >actual &&
	(
		echo "100644 $o0 1	a"
		echo "100644 $o1 2	a"
		echo "100644 $o5 3	a"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive d/f simple' '
	rm -fr [abcd] &&
	git reset --hard &&
	git checkout -f "$c1" &&

	git merge-recursive "$c0" -- "$c1" "$c3"
'

test_expect_success 'merge-recursive result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	a"
		echo "100644 $o3 0	b/c"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive d/f conflict' '

	rm -fr [abcd] &&
	git reset --hard &&
	git checkout -f "$c1" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
'

test_expect_success 'merge-recursive d/f conflict result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o0 1	a"
		echo "100644 $o1 2	a"
		echo "100644 $o4 0	a/c"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive d/f conflict the other way' '

	rm -fr [abcd] &&
	git reset --hard &&
	git checkout -f "$c4" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
'

test_expect_success 'merge-recursive d/f conflict result the other way' '

	git ls-files -s >actual &&
	(
		echo "100644 $o0 1	a"
		echo "100644 $o1 3	a"
		echo "100644 $o4 0	a/c"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive d/f conflict' '

	rm -fr [abcd] &&
	git reset --hard &&
	git checkout -f "$c1" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
'

test_expect_success 'merge-recursive d/f conflict result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o6 3	d"
		echo "100644 $o0 1	d/e"
		echo "100644 $o1 2	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive d/f conflict' '

	rm -fr [abcd] &&
	git reset --hard &&
	git checkout -f "$c6" &&

	test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
'

test_expect_success 'merge-recursive d/f conflict result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o6 2	d"
		echo "100644 $o0 1	d/e"
		echo "100644 $o1 3	d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'reset and 3-way merge' '

	git reset --hard "$c2" &&
	git read-tree -m "$c0" "$c2" "$c1"

'

test_expect_success 'reset and bind merge' '

	git reset --hard master &&
	git read-tree --prefix=M/ master &&
	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	M/a"
		echo "100644 $o0 0	M/b"
		echo "100644 $o0 0	M/c"
		echo "100644 $o1 0	M/d/e"
		echo "100644 $o1 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	git read-tree --prefix=a1/ master &&
	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	M/a"
		echo "100644 $o0 0	M/b"
		echo "100644 $o0 0	M/c"
		echo "100644 $o1 0	M/d/e"
		echo "100644 $o1 0	a"
		echo "100644 $o1 0	a1/a"
		echo "100644 $o0 0	a1/b"
		echo "100644 $o0 0	a1/c"
		echo "100644 $o1 0	a1/d/e"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
	) >expected &&
	test_cmp expected actual &&

	git read-tree --prefix=z/ master &&
	git ls-files -s >actual &&
	(
		echo "100644 $o1 0	M/a"
		echo "100644 $o0 0	M/b"
		echo "100644 $o0 0	M/c"
		echo "100644 $o1 0	M/d/e"
		echo "100644 $o1 0	a"
		echo "100644 $o1 0	a1/a"
		echo "100644 $o0 0	a1/b"
		echo "100644 $o0 0	a1/c"
		echo "100644 $o1 0	a1/d/e"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o1 0	d/e"
		echo "100644 $o1 0	z/a"
		echo "100644 $o0 0	z/b"
		echo "100644 $o0 0	z/c"
		echo "100644 $o1 0	z/d/e"
	) >expected &&
	test_cmp expected actual

'

test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
	(
		GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
		export GIT_WORK_TREE &&
		GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
		export GIT_INDEX_FILE &&
		mkdir "$GIT_WORK_TREE" &&
		git read-tree -i -m $c7 &&
		git update-index --ignore-missing --refresh &&
		git merge-recursive $c0 -- $c7 $c3 &&
		git ls-files -s >actual-files
	) 2>actual-err &&
	>expected-err &&
	cat >expected-files <<-EOF &&
	100644 $o3 0	b/c
	100644 $o0 0	c
	100644 $o0 0	d/e
	100644 $o0 0	e
	EOF
	test_cmp expected-files actual-files &&
	test_cmp expected-err actual-err
'

test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
	(
		GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
		export GIT_WORK_TREE &&
		GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
		export GIT_INDEX_FILE &&
		mkdir "$GIT_WORK_TREE" &&
		git read-tree -i -m $c3 &&
		git update-index --ignore-missing --refresh &&
		git merge-recursive $c0 -- $c3 $c7 &&
		git ls-files -s >actual-files
	) 2>actual-err &&
	>expected-err &&
	cat >expected-files <<-EOF &&
	100644 $o3 0	b/c
	100644 $o0 0	c
	100644 $o0 0	d/e
	100644 $o0 0	e
	EOF
	test_cmp expected-files actual-files &&
	test_cmp expected-err actual-err
'

test_expect_success 'merge removes empty directories' '

	git reset --hard master &&
	git checkout -b rm &&
	git rm d/e &&
	git commit -mremoved-d/e &&
	git checkout master &&
	git merge -s recursive rm &&
	test_must_fail test -d d
'

test_expect_failure 'merge-recursive simple w/submodule' '

	git checkout submod &&
	git merge remove
'

test_expect_failure 'merge-recursive simple w/submodule result' '

	git ls-files -s >actual &&
	(
		echo "100644 $o5 0	a"
		echo "100644 $o0 0	c"
		echo "160000 $c1 0	d"
	) >expected &&
	test_cmp expected actual
'

test_expect_success 'merge-recursive copy vs. rename' '
	git checkout -f copy &&
	git merge rename &&
	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
	(
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 blob $o0	e"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
		echo "100644 $o0 0	e"
	) >expected &&
	test_cmp expected actual
'

test_expect_failure 'merge-recursive rename vs. rename/symlink' '

	git checkout -f rename &&
	git merge rename-ln &&
	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	(
		echo "120000 blob $oln	a"
		echo "100644 blob $o0	b"
		echo "100644 blob $o0	c"
		echo "100644 blob $o0	d/e"
		echo "100644 blob $o0	e"
		echo "120000 $oln 0	a"
		echo "100644 $o0 0	b"
		echo "100644 $o0 0	c"
		echo "100644 $o0 0	d/e"
		echo "100644 $o0 0	e"
	) >expected &&
	test_cmp expected actual
'


test_done
Commit	Line	Data
885b9810 JH	1	#!/bin/sh
	2
	3	test_description='merge-recursive backend test'
	4
	5	. ./test-lib.sh
	6
	7	test_expect_success 'setup 1' '
	8
	9	echo hello >a &&
	10	o0=$(git hash-object a) &&
	11	cp a b &&
744747ef	12	cp a c &&
885b9810 JH	13	mkdir d &&
	14	cp a d/e &&
	15
	16	test_tick &&
744747ef	17	git add a b c d/e &&
885b9810 JH	18	git commit -m initial &&
	19	c0=$(git rev-parse --verify HEAD) &&
	20	git branch side &&
	21	git branch df-1 &&
	22	git branch df-2 &&
	23	git branch df-3 &&
	24	git branch remove &&
7d82b06d	25	git branch submod &&
d5af5105 SK	26	git branch copy &&
d5af5105 SK	27	git branch rename &&
bba56042	28	git branch rename-ln &&
885b9810 JH	29
	30	echo hello >>a &&
	31	cp a d/e &&
	32	o1=$(git hash-object a) &&
	33
	34	git add a d/e &&
	35
	36	test_tick &&
	37	git commit -m "master modifies a and d/e" &&
	38	c1=$(git rev-parse --verify HEAD) &&
	39	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	40	(
885b9810 JH	41	echo "100644 blob $o1 a"
885b9810 JH	42	echo "100644 blob $o0 b"
744747ef	43	echo "100644 blob $o0 c"
885b9810	44	echo "100644 blob $o1 d/e"
885b9810 JH	45	echo "100644 $o1 0 a"
885b9810 JH	46	echo "100644 $o0 0 b"
744747ef	47	echo "100644 $o0 0 c"
885b9810 JH	48	echo "100644 $o1 0 d/e"
885b9810 JH	49	) >expected &&
3af82863	50	test_cmp expected actual
885b9810 JH	51	'
	52
	53	test_expect_success 'setup 2' '
	54
744747ef	55	rm -rf [abcd] &&
885b9810 JH	56	git checkout side &&
	57	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	58	(
885b9810 JH	59	echo "100644 blob $o0 a"
885b9810 JH	60	echo "100644 blob $o0 b"
744747ef	61	echo "100644 blob $o0 c"
885b9810	62	echo "100644 blob $o0 d/e"
885b9810 JH	63	echo "100644 $o0 0 a"
885b9810 JH	64	echo "100644 $o0 0 b"
744747ef	65	echo "100644 $o0 0 c"
885b9810 JH	66	echo "100644 $o0 0 d/e"
885b9810 JH	67	) >expected &&
3af82863	68	test_cmp expected actual &&
885b9810 JH	69
	70	echo goodbye >>a &&
	71	o2=$(git hash-object a) &&
	72
	73	git add a &&
	74
	75	test_tick &&
	76	git commit -m "side modifies a" &&
	77	c2=$(git rev-parse --verify HEAD) &&
	78	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	79	(
885b9810 JH	80	echo "100644 blob $o2 a"
885b9810 JH	81	echo "100644 blob $o0 b"
744747ef	82	echo "100644 blob $o0 c"
885b9810	83	echo "100644 blob $o0 d/e"
885b9810 JH	84	echo "100644 $o2 0 a"
885b9810 JH	85	echo "100644 $o0 0 b"
744747ef	86	echo "100644 $o0 0 c"
885b9810 JH	87	echo "100644 $o0 0 d/e"
885b9810 JH	88	) >expected &&
3af82863	89	test_cmp expected actual
885b9810 JH	90	'
	91
	92	test_expect_success 'setup 3' '
	93
744747ef	94	rm -rf [abcd] &&
885b9810 JH	95	git checkout df-1 &&
	96	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	97	(
885b9810 JH	98	echo "100644 blob $o0 a"
885b9810 JH	99	echo "100644 blob $o0 b"
744747ef	100	echo "100644 blob $o0 c"
885b9810	101	echo "100644 blob $o0 d/e"
885b9810 JH	102	echo "100644 $o0 0 a"
885b9810 JH	103	echo "100644 $o0 0 b"
744747ef	104	echo "100644 $o0 0 c"
885b9810 JH	105	echo "100644 $o0 0 d/e"
885b9810 JH	106	) >expected &&
3af82863	107	test_cmp expected actual &&
885b9810 JH	108
	109	rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
	110	o3=$(git hash-object b/c) &&
	111
	112	test_tick &&
	113	git commit -m "df-1 makes b/c" &&
	114	c3=$(git rev-parse --verify HEAD) &&
	115	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	116	(
885b9810 JH	117	echo "100644 blob $o0 a"
885b9810 JH	118	echo "100644 blob $o3 b/c"
744747ef	119	echo "100644 blob $o0 c"
885b9810	120	echo "100644 blob $o0 d/e"
885b9810 JH	121	echo "100644 $o0 0 a"
885b9810 JH	122	echo "100644 $o3 0 b/c"
744747ef	123	echo "100644 $o0 0 c"
885b9810 JH	124	echo "100644 $o0 0 d/e"
885b9810 JH	125	) >expected &&
3af82863	126	test_cmp expected actual
885b9810 JH	127	'
	128
	129	test_expect_success 'setup 4' '
	130
744747ef	131	rm -rf [abcd] &&
885b9810 JH	132	git checkout df-2 &&
	133	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	134	(
885b9810 JH	135	echo "100644 blob $o0 a"
885b9810 JH	136	echo "100644 blob $o0 b"
744747ef	137	echo "100644 blob $o0 c"
885b9810	138	echo "100644 blob $o0 d/e"
885b9810 JH	139	echo "100644 $o0 0 a"
885b9810 JH	140	echo "100644 $o0 0 b"
744747ef	141	echo "100644 $o0 0 c"
885b9810 JH	142	echo "100644 $o0 0 d/e"
885b9810 JH	143	) >expected &&
3af82863	144	test_cmp expected actual &&
885b9810 JH	145
	146	rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
	147	o4=$(git hash-object a/c) &&
	148
	149	test_tick &&
	150	git commit -m "df-2 makes a/c" &&
	151	c4=$(git rev-parse --verify HEAD) &&
	152	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	153	(
885b9810 JH	154	echo "100644 blob $o4 a/c"
885b9810 JH	155	echo "100644 blob $o0 b"
744747ef	156	echo "100644 blob $o0 c"
885b9810	157	echo "100644 blob $o0 d/e"
885b9810 JH	158	echo "100644 $o4 0 a/c"
885b9810 JH	159	echo "100644 $o0 0 b"
744747ef	160	echo "100644 $o0 0 c"
885b9810 JH	161	echo "100644 $o0 0 d/e"
885b9810 JH	162	) >expected &&
3af82863	163	test_cmp expected actual
885b9810 JH	164	'
	165
	166	test_expect_success 'setup 5' '
	167
744747ef	168	rm -rf [abcd] &&
885b9810 JH	169	git checkout remove &&
	170	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	171	(
885b9810 JH	172	echo "100644 blob $o0 a"
885b9810 JH	173	echo "100644 blob $o0 b"
744747ef	174	echo "100644 blob $o0 c"
885b9810	175	echo "100644 blob $o0 d/e"
885b9810 JH	176	echo "100644 $o0 0 a"
885b9810 JH	177	echo "100644 $o0 0 b"
744747ef	178	echo "100644 $o0 0 c"
885b9810 JH	179	echo "100644 $o0 0 d/e"
885b9810 JH	180	) >expected &&
3af82863	181	test_cmp expected actual &&
885b9810 JH	182
	183	rm -f b &&
	184	echo remove-conflict >a &&
	185
	186	git add a &&
	187	git rm b &&
	188	o5=$(git hash-object a) &&
	189
	190	test_tick &&
	191	git commit -m "remove removes b and modifies a" &&
	192	c5=$(git rev-parse --verify HEAD) &&
	193	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	194	(
885b9810	195	echo "100644 blob $o5 a"
744747ef	196	echo "100644 blob $o0 c"
885b9810	197	echo "100644 blob $o0 d/e"
885b9810	198	echo "100644 $o5 0 a"
744747ef	199	echo "100644 $o0 0 c"
885b9810 JH	200	echo "100644 $o0 0 d/e"
885b9810 JH	201	) >expected &&
3af82863	202	test_cmp expected actual
885b9810 JH	203
	204	'
	205
	206	test_expect_success 'setup 6' '
	207
744747ef	208	rm -rf [abcd] &&
885b9810 JH	209	git checkout df-3 &&
	210	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	211	(
885b9810 JH	212	echo "100644 blob $o0 a"
885b9810 JH	213	echo "100644 blob $o0 b"
744747ef	214	echo "100644 blob $o0 c"
885b9810	215	echo "100644 blob $o0 d/e"
885b9810 JH	216	echo "100644 $o0 0 a"
885b9810 JH	217	echo "100644 $o0 0 b"
744747ef	218	echo "100644 $o0 0 c"
885b9810 JH	219	echo "100644 $o0 0 d/e"
885b9810 JH	220	) >expected &&
3af82863	221	test_cmp expected actual &&
885b9810 JH	222
	223	rm -fr d && echo df-3 >d && git add d &&
	224	o6=$(git hash-object d) &&
	225
	226	test_tick &&
	227	git commit -m "df-3 makes d" &&
	228	c6=$(git rev-parse --verify HEAD) &&
	229	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	230	(
885b9810 JH	231	echo "100644 blob $o0 a"
885b9810 JH	232	echo "100644 blob $o0 b"
744747ef	233	echo "100644 blob $o0 c"
885b9810	234	echo "100644 blob $o6 d"
885b9810 JH	235	echo "100644 $o0 0 a"
885b9810 JH	236	echo "100644 $o0 0 b"
744747ef	237	echo "100644 $o0 0 c"
885b9810 JH	238	echo "100644 $o6 0 d"
885b9810 JH	239	) >expected &&
3af82863	240	test_cmp expected actual
885b9810 JH	241	'
885b9810 JH	242
7d82b06d JS	243	test_expect_success 'setup 7' '
	244
	245	git checkout submod &&
	246	git rm d/e &&
	247	test_tick &&
	248	git commit -m "remove d/e" &&
	249	git update-index --add --cacheinfo 160000 $c1 d &&
	250	test_tick &&
	251	git commit -m "make d/ a submodule"
	252	'
	253
d5af5105 SK	254	test_expect_success 'setup 8' '
	255	git checkout rename &&
	256	git mv a e &&
	257	git add e &&
	258	test_tick &&
8a1c0d32	259	git commit -m "rename a->e" &&
29d9af58	260	c7=$(git rev-parse --verify HEAD) &&
bba56042 JS	261	git checkout rename-ln &&
	262	git mv a e &&
	263	test_ln_s_add e a &&
	264	test_tick &&
	265	git commit -m "rename a->e, symlink a->e" &&
	266	oln=`printf e \| git hash-object --stdin`
d5af5105 SK	267	'
	268
	269	test_expect_success 'setup 9' '
	270	git checkout copy &&
	271	cp a e &&
	272	git add e &&
	273	test_tick &&
	274	git commit -m "copy a->e"
	275	'
	276
885b9810 JH	277	test_expect_success 'merge-recursive simple' '
885b9810 JH	278
744747ef	279	rm -fr [abcd] &&
885b9810 JH	280	git checkout -f "$c2" &&
885b9810 JH	281
67b6afe1	282	test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
885b9810 JH	283	'
	284
	285	test_expect_success 'merge-recursive result' '
	286
	287	git ls-files -s >actual &&
	288	(
885b9810 JH	289	echo "100644 $o0 1 a"
	290	echo "100644 $o2 2 a"
	291	echo "100644 $o1 3 a"
	292	echo "100644 $o0 0 b"
744747ef	293	echo "100644 $o0 0 c"
885b9810 JH	294	echo "100644 $o1 0 d/e"
885b9810 JH	295	) >expected &&
3af82863	296	test_cmp expected actual
885b9810 JH	297
	298	'
	299
f2c8c800	300	test_expect_success 'fail if the index has unresolved entries' '
446247db JH	301
	302	rm -fr [abcd] &&
	303	git checkout -f "$c1" &&
	304
	305	test_must_fail git merge "$c5" &&
	306	test_must_fail git merge "$c5" 2> out &&
f2c8c800	307	test_i18ngrep "not possible because you have unmerged files" out &&
d38a30df MM	308	git add -u &&
d38a30df MM	309	test_must_fail git merge "$c5" 2> out &&
f2c8c800	310	test_i18ngrep "You have not concluded your merge" out &&
c8c562a2 CB	311	rm -f .git/MERGE_HEAD &&
c8c562a2 CB	312	test_must_fail git merge "$c5" 2> out &&
f2c8c800	313	test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
446247db JH	314	'
446247db JH	315
885b9810 JH	316	test_expect_success 'merge-recursive remove conflict' '
885b9810 JH	317
744747ef	318	rm -fr [abcd] &&
885b9810 JH	319	git checkout -f "$c1" &&
885b9810 JH	320
67b6afe1	321	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
885b9810 JH	322	'
	323
	324	test_expect_success 'merge-recursive remove conflict' '
	325
	326	git ls-files -s >actual &&
	327	(
885b9810 JH	328	echo "100644 $o0 1 a"
	329	echo "100644 $o1 2 a"
	330	echo "100644 $o5 3 a"
744747ef	331	echo "100644 $o0 0 c"
885b9810 JH	332	echo "100644 $o1 0 d/e"
885b9810 JH	333	) >expected &&
3af82863	334	test_cmp expected actual
885b9810 JH	335
	336	'
	337
	338	test_expect_success 'merge-recursive d/f simple' '
744747ef	339	rm -fr [abcd] &&
885b9810 JH	340	git reset --hard &&
	341	git checkout -f "$c1" &&
	342
0cb0e143	343	git merge-recursive "$c0" -- "$c1" "$c3"
885b9810 JH	344	'
	345
	346	test_expect_success 'merge-recursive result' '
	347
	348	git ls-files -s >actual &&
	349	(
885b9810 JH	350	echo "100644 $o1 0 a"
885b9810 JH	351	echo "100644 $o3 0 b/c"
744747ef	352	echo "100644 $o0 0 c"
885b9810 JH	353	echo "100644 $o1 0 d/e"
885b9810 JH	354	) >expected &&
3af82863	355	test_cmp expected actual
885b9810 JH	356
	357	'
	358
	359	test_expect_success 'merge-recursive d/f conflict' '
	360
744747ef	361	rm -fr [abcd] &&
885b9810 JH	362	git reset --hard &&
	363	git checkout -f "$c1" &&
	364
67b6afe1	365	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
885b9810 JH	366	'
	367
	368	test_expect_success 'merge-recursive d/f conflict result' '
	369
	370	git ls-files -s >actual &&
	371	(
885b9810 JH	372	echo "100644 $o0 1 a"
	373	echo "100644 $o1 2 a"
	374	echo "100644 $o4 0 a/c"
	375	echo "100644 $o0 0 b"
744747ef	376	echo "100644 $o0 0 c"
885b9810 JH	377	echo "100644 $o1 0 d/e"
885b9810 JH	378	) >expected &&
3af82863	379	test_cmp expected actual
885b9810 JH	380
	381	'
	382
	383	test_expect_success 'merge-recursive d/f conflict the other way' '
	384
744747ef	385	rm -fr [abcd] &&
885b9810 JH	386	git reset --hard &&
	387	git checkout -f "$c4" &&
	388
67b6afe1	389	test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
885b9810 JH	390	'
	391
	392	test_expect_success 'merge-recursive d/f conflict result the other way' '
	393
	394	git ls-files -s >actual &&
	395	(
885b9810 JH	396	echo "100644 $o0 1 a"
	397	echo "100644 $o1 3 a"
	398	echo "100644 $o4 0 a/c"
	399	echo "100644 $o0 0 b"
744747ef	400	echo "100644 $o0 0 c"
885b9810 JH	401	echo "100644 $o1 0 d/e"
885b9810 JH	402	) >expected &&
3af82863	403	test_cmp expected actual
885b9810 JH	404
	405	'
	406
	407	test_expect_success 'merge-recursive d/f conflict' '
	408
744747ef	409	rm -fr [abcd] &&
885b9810 JH	410	git reset --hard &&
	411	git checkout -f "$c1" &&
	412
67b6afe1	413	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
885b9810 JH	414	'
	415
	416	test_expect_success 'merge-recursive d/f conflict result' '
	417
	418	git ls-files -s >actual &&
	419	(
885b9810 JH	420	echo "100644 $o1 0 a"
885b9810 JH	421	echo "100644 $o0 0 b"
744747ef	422	echo "100644 $o0 0 c"
885b9810 JH	423	echo "100644 $o6 3 d"
	424	echo "100644 $o0 1 d/e"
	425	echo "100644 $o1 2 d/e"
	426	) >expected &&
3af82863	427	test_cmp expected actual
885b9810 JH	428
	429	'
	430
	431	test_expect_success 'merge-recursive d/f conflict' '
	432
744747ef	433	rm -fr [abcd] &&
885b9810 JH	434	git reset --hard &&
	435	git checkout -f "$c6" &&
	436
67b6afe1	437	test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
885b9810 JH	438	'
	439
	440	test_expect_success 'merge-recursive d/f conflict result' '
	441
	442	git ls-files -s >actual &&
	443	(
885b9810 JH	444	echo "100644 $o1 0 a"
885b9810 JH	445	echo "100644 $o0 0 b"
744747ef	446	echo "100644 $o0 0 c"
885b9810 JH	447	echo "100644 $o6 2 d"
	448	echo "100644 $o0 1 d/e"
	449	echo "100644 $o1 3 d/e"
	450	) >expected &&
3af82863	451	test_cmp expected actual
885b9810 JH	452
	453	'
	454
	455	test_expect_success 'reset and 3-way merge' '
	456
	457	git reset --hard "$c2" &&
	458	git read-tree -m "$c0" "$c2" "$c1"
	459
	460	'
	461
	462	test_expect_success 'reset and bind merge' '
	463
	464	git reset --hard master &&
	465	git read-tree --prefix=M/ master &&
	466	git ls-files -s >actual &&
	467	(
885b9810 JH	468	echo "100644 $o1 0 M/a"
885b9810 JH	469	echo "100644 $o0 0 M/b"
744747ef	470	echo "100644 $o0 0 M/c"
885b9810 JH	471	echo "100644 $o1 0 M/d/e"
	472	echo "100644 $o1 0 a"
	473	echo "100644 $o0 0 b"
744747ef	474	echo "100644 $o0 0 c"
885b9810 JH	475	echo "100644 $o1 0 d/e"
885b9810 JH	476	) >expected &&
3af82863	477	test_cmp expected actual &&
885b9810 JH	478
	479	git read-tree --prefix=a1/ master &&
	480	git ls-files -s >actual &&
	481	(
885b9810 JH	482	echo "100644 $o1 0 M/a"
885b9810 JH	483	echo "100644 $o0 0 M/b"
744747ef	484	echo "100644 $o0 0 M/c"
885b9810 JH	485	echo "100644 $o1 0 M/d/e"
885b9810 JH	486	echo "100644 $o1 0 a"
885b9810 JH	487	echo "100644 $o1 0 a1/a"
885b9810 JH	488	echo "100644 $o0 0 a1/b"
744747ef	489	echo "100644 $o0 0 a1/c"
885b9810 JH	490	echo "100644 $o1 0 a1/d/e"
885b9810 JH	491	echo "100644 $o0 0 b"
744747ef	492	echo "100644 $o0 0 c"
885b9810 JH	493	echo "100644 $o1 0 d/e"
885b9810 JH	494	) >expected &&
a48fcd83	495	test_cmp expected actual &&
885b9810 JH	496
	497	git read-tree --prefix=z/ master &&
	498	git ls-files -s >actual &&
	499	(
885b9810 JH	500	echo "100644 $o1 0 M/a"
885b9810 JH	501	echo "100644 $o0 0 M/b"
744747ef	502	echo "100644 $o0 0 M/c"
885b9810 JH	503	echo "100644 $o1 0 M/d/e"
885b9810 JH	504	echo "100644 $o1 0 a"
885b9810 JH	505	echo "100644 $o1 0 a1/a"
885b9810 JH	506	echo "100644 $o0 0 a1/b"
744747ef	507	echo "100644 $o0 0 a1/c"
885b9810 JH	508	echo "100644 $o1 0 a1/d/e"
885b9810 JH	509	echo "100644 $o0 0 b"
744747ef	510	echo "100644 $o0 0 c"
885b9810	511	echo "100644 $o1 0 d/e"
885b9810 JH	512	echo "100644 $o1 0 z/a"
885b9810 JH	513	echo "100644 $o0 0 z/b"
744747ef	514	echo "100644 $o0 0 z/c"
885b9810 JH	515	echo "100644 $o1 0 z/d/e"
885b9810 JH	516	) >expected &&
3af82863	517	test_cmp expected actual
885b9810 JH	518
	519	'
	520
6e2068ae	521	test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
29d9af58 BK	522	(
	523	GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
	524	export GIT_WORK_TREE &&
	525	GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
	526	export GIT_INDEX_FILE &&
	527	mkdir "$GIT_WORK_TREE" &&
	528	git read-tree -i -m $c7 &&
	529	git update-index --ignore-missing --refresh &&
	530	git merge-recursive $c0 -- $c7 $c3 &&
	531	git ls-files -s >actual-files
	532	) 2>actual-err &&
	533	>expected-err &&
	534	cat >expected-files <<-EOF &&
	535	100644 $o3 0 b/c
	536	100644 $o0 0 c
	537	100644 $o0 0 d/e
	538	100644 $o0 0 e
	539	EOF
	540	test_cmp expected-files actual-files &&
	541	test_cmp expected-err actual-err
	542	'
	543
	544	test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
	545	(
	546	GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
	547	export GIT_WORK_TREE &&
	548	GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
	549	export GIT_INDEX_FILE &&
	550	mkdir "$GIT_WORK_TREE" &&
	551	git read-tree -i -m $c3 &&
	552	git update-index --ignore-missing --refresh &&
	553	git merge-recursive $c0 -- $c3 $c7 &&
	554	git ls-files -s >actual-files
	555	) 2>actual-err &&
	556	>expected-err &&
	557	cat >expected-files <<-EOF &&
	558	100644 $o3 0 b/c
	559	100644 $o0 0 c
	560	100644 $o0 0 d/e
	561	100644 $o0 0 e
	562	EOF
	563	test_cmp expected-files actual-files &&
	564	test_cmp expected-err actual-err
	565	'
	566
41f13af5 AR	567	test_expect_success 'merge removes empty directories' '
	568
	569	git reset --hard master &&
	570	git checkout -b rm &&
	571	git rm d/e &&
	572	git commit -mremoved-d/e &&
	573	git checkout master &&
	574	git merge -s recursive rm &&
	575	test_must_fail test -d d
	576	'
	577
7d82b06d JS	578	test_expect_failure 'merge-recursive simple w/submodule' '
	579
	580	git checkout submod &&
	581	git merge remove
	582	'
	583
	584	test_expect_failure 'merge-recursive simple w/submodule result' '
	585
	586	git ls-files -s >actual &&
	587	(
	588	echo "100644 $o5 0 a"
	589	echo "100644 $o0 0 c"
	590	echo "160000 $c1 0 d"
	591	) >expected &&
	592	test_cmp expected actual
	593	'
	594
d5af5105 SK	595	test_expect_success 'merge-recursive copy vs. rename' '
	596	git checkout -f copy &&
	597	git merge rename &&
	598	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
	599	(
	600	echo "100644 blob $o0 b"
	601	echo "100644 blob $o0 c"
	602	echo "100644 blob $o0 d/e"
	603	echo "100644 blob $o0 e"
	604	echo "100644 $o0 0 b"
	605	echo "100644 $o0 0 c"
	606	echo "100644 $o0 0 d/e"
	607	echo "100644 $o0 0 e"
	608	) >expected &&
	609	test_cmp expected actual
	610	'
	611
bba56042 JS	612	test_expect_failure 'merge-recursive rename vs. rename/symlink' '
	613
	614	git checkout -f rename &&
	615	git merge rename-ln &&
	616	( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
	617	(
	618	echo "120000 blob $oln a"
	619	echo "100644 blob $o0 b"
	620	echo "100644 blob $o0 c"
	621	echo "100644 blob $o0 d/e"
	622	echo "100644 blob $o0 e"
	623	echo "120000 $oln 0 a"
	624	echo "100644 $o0 0 b"
	625	echo "100644 $o0 0 c"
	626	echo "100644 $o0 0 d/e"
	627	echo "100644 $o0 0 e"
	628	) >expected &&
	629	test_cmp expected actual
	630	'
8a1c0d32 SK	631
8a1c0d32 SK	632
885b9810	633	test_done