[thirdparty/git.git] / t / t6042-merge-rename-corner-cases.sh

#!/bin/sh

test_description="recursive merge corner cases w/ renames but not criss-crosses"
# t6036 has corner cases that involve both criss-cross merges and renames

. ./test-lib.sh

test_expect_success 'setup rename/delete + untracked file' '
	test_create_repo rename-delete-untracked &&
	(
		cd rename-delete-untracked &&

		echo "A pretty inscription" >ring &&
		git add ring &&
		test_tick &&
		git commit -m beginning &&

		git branch people &&
		git checkout -b rename-the-ring &&
		git mv ring one-ring-to-rule-them-all &&
		test_tick &&
		git commit -m fullname &&

		git checkout people &&
		git rm ring &&
		echo gollum >owner &&
		git add owner &&
		test_tick &&
		git commit -m track-people-instead-of-objects &&
		echo "Myyy PRECIOUSSS" >ring
	)
'

test_expect_success "Does git preserve Gollum's precious artifact?" '
	(
		cd rename-delete-untracked &&

		test_must_fail git merge -s recursive rename-the-ring &&

		# Make sure git did not delete an untracked file
		test_path_is_file ring
	)
'

# Testcase setup for rename/modify/add-source:
#   Commit A: new file: a
#   Commit B: modify a slightly
#   Commit C: rename a->b, add completely different a
#
# We should be able to merge B & C cleanly

test_expect_success 'setup rename/modify/add-source conflict' '
	test_create_repo rename-modify-add-source &&
	(
		cd rename-modify-add-source &&

		printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
		git add a &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		echo 8 >>a &&
		git add a &&
		git commit -m B &&

		git checkout -b C A &&
		git mv a b &&
		echo something completely different >a &&
		git add a &&
		git commit -m C
	)
'

test_expect_failure 'rename/modify/add-source conflict resolvable' '
	(
		cd rename-modify-add-source &&

		git checkout B^0 &&

		git merge -s recursive C^0 &&

		git rev-parse >expect \
			B:a   C:a     &&
		git rev-parse >actual \
			b     c       &&
		test_cmp expect actual
	)
'

test_expect_success 'setup resolvable conflict missed if rename missed' '
	test_create_repo break-detection-1 &&
	(
		cd break-detection-1 &&

		printf "1\n2\n3\n4\n5\n" >a &&
		echo foo >b &&
		git add a b &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		git mv a c &&
		echo "Completely different content" >a &&
		git add a &&
		git commit -m B &&

		git checkout -b C A &&
		echo 6 >>a &&
		git add a &&
		git commit -m C
	)
'

test_expect_failure 'conflict caused if rename not detected' '
	(
		cd break-detection-1 &&

		git checkout -q C^0 &&
		git merge -s recursive B^0 &&

		git ls-files -s >out &&
		test_line_count = 3 out &&
		git ls-files -u >out &&
		test_line_count = 0 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		test_line_count = 6 c &&
		git rev-parse >expect \
			B:a   A:b     &&
		git rev-parse >actual \
			:0:a  :0:b    &&
		test_cmp expect actual
	)
'

test_expect_success 'setup conflict resolved wrong if rename missed' '
	test_create_repo break-detection-2 &&
	(
		cd break-detection-2 &&

		printf "1\n2\n3\n4\n5\n" >a &&
		echo foo >b &&
		git add a b &&
		git commit -m A &&
		git tag A &&

		git checkout -b D A &&
		echo 7 >>a &&
		git add a &&
		git mv a c &&
		echo "Completely different content" >a &&
		git add a &&
		git commit -m D &&

		git checkout -b E A &&
		git rm a &&
		echo "Completely different content" >>a &&
		git add a &&
		git commit -m E
	)
'

test_expect_failure 'missed conflict if rename not detected' '
	(
		cd break-detection-2 &&

		git checkout -q E^0 &&
		test_must_fail git merge -s recursive D^0
	)
'

# Tests for undetected rename/add-source causing a file to erroneously be
# deleted (and for mishandled rename/rename(1to1) causing the same issue).
#
# This test uses a rename/rename(1to1)+add-source conflict (1to1 means the
# same file is renamed on both sides to the same thing; it should trigger
# the 1to2 logic, which it would do if the add-source didn't cause issues
# for git's rename detection):
#   Commit A: new file: a
#   Commit B: rename a->b
#   Commit C: rename a->b, add unrelated a

test_expect_success 'setup undetected rename/add-source causes data loss' '
	test_create_repo break-detection-3 &&
	(
		cd break-detection-3 &&

		printf "1\n2\n3\n4\n5\n" >a &&
		git add a &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		git mv a b &&
		git commit -m B &&

		git checkout -b C A &&
		git mv a b &&
		echo foobar >a &&
		git add a &&
		git commit -m C
	)
'

test_expect_failure 'detect rename/add-source and preserve all data' '
	(
		cd break-detection-3 &&

		git checkout B^0 &&

		git merge -s recursive C^0 &&

		git ls-files -s >out &&
		test_line_count = 2 out &&
		git ls-files -u >out &&
		test_line_count = 2 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		test_path_is_file a &&
		test_path_is_file b &&

		git rev-parse >expect \
			A:a   C:a     &&
		git rev-parse >actual \
			:0:b  :0:a    &&
		test_cmp expect actual
	)
'

test_expect_failure 'detect rename/add-source and preserve all data, merge other way' '
	(
		cd break-detection-3 &&

		git checkout C^0 &&

		git merge -s recursive B^0 &&

		git ls-files -s >out &&
		test_line_count = 2 out &&
		git ls-files -u >out &&
		test_line_count = 2 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		test_path_is_file a &&
		test_path_is_file b &&

		git rev-parse >expect \
			A:a   C:a     &&
		git rev-parse >actual \
			:0:b  :0:a    &&
		test_cmp expect actual
	)
'

test_expect_success 'setup content merge + rename/directory conflict' '
	test_create_repo rename-directory-1 &&
	(
		cd rename-directory-1 &&

		printf "1\n2\n3\n4\n5\n6\n" >file &&
		git add file &&
		test_tick &&
		git commit -m base &&
		git tag base &&

		git checkout -b right &&
		echo 7 >>file &&
		mkdir newfile &&
		echo junk >newfile/realfile &&
		git add file newfile/realfile &&
		test_tick &&
		git commit -m right &&

		git checkout -b left-conflict base &&
		echo 8 >>file &&
		git add file &&
		git mv file newfile &&
		test_tick &&
		git commit -m left &&

		git checkout -b left-clean base &&
		echo 0 >newfile &&
		cat file >>newfile &&
		git add newfile &&
		git rm file &&
		test_tick &&
		git commit -m left
	)
'

test_expect_success 'rename/directory conflict + clean content merge' '
	(
		cd rename-directory-1 &&

		git checkout left-clean^0 &&

		test_must_fail git merge -s recursive right^0 &&

		git ls-files -s >out &&
		test_line_count = 2 out &&
		git ls-files -u >out &&
		test_line_count = 1 out &&
		git ls-files -o >out &&
		test_line_count = 2 out &&

		echo 0 >expect &&
		git cat-file -p base:file >>expect &&
		echo 7 >>expect &&
		test_cmp expect newfile~HEAD &&

		test $(git rev-parse :2:newfile) = $(git hash-object expect) &&

		test_path_is_file newfile/realfile &&
		test_path_is_file newfile~HEAD
	)
'

test_expect_success 'rename/directory conflict + content merge conflict' '
	(
		cd rename-directory-1 &&

		git reset --hard &&
		git reset --hard &&
		git clean -fdqx &&

		git checkout left-conflict^0 &&

		test_must_fail git merge -s recursive right^0 &&

		git ls-files -s >out &&
		test_line_count = 4 out &&
		git ls-files -u >out &&
		test_line_count = 3 out &&
		git ls-files -o >out &&
		test_line_count = 2 out &&

		git cat-file -p left-conflict:newfile >left &&
		git cat-file -p base:file    >base &&
		git cat-file -p right:file   >right &&
		test_must_fail git merge-file \
			-L "HEAD:newfile" \
			-L "" \
			-L "right^0:file" \
			left base right &&
		test_cmp left newfile~HEAD &&

		git rev-parse >expect                                 \
			base:file   left-conflict:newfile  right:file &&
		git rev-parse >actual                                 \
			:1:newfile  :2:newfile             :3:newfile &&
		test_cmp expect actual &&

		test_path_is_file newfile/realfile &&
		test_path_is_file newfile~HEAD
	)
'

test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
	test_create_repo rename-directory-2 &&
	(
		cd rename-directory-2 &&

		mkdir sub &&
		printf "1\n2\n3\n4\n5\n6\n" >sub/file &&
		git add sub/file &&
		test_tick &&
		git commit -m base &&
		git tag base &&

		git checkout -b right &&
		echo 7 >>sub/file &&
		git add sub/file &&
		test_tick &&
		git commit -m right &&

		git checkout -b left base &&
		echo 0 >newfile &&
		cat sub/file >>newfile &&
		git rm sub/file &&
		mv newfile sub &&
		git add sub &&
		test_tick &&
		git commit -m left
	)
'

test_expect_success 'disappearing dir in rename/directory conflict handled' '
	(
		cd rename-directory-2 &&

		git checkout left^0 &&

		git merge -s recursive right^0 &&

		git ls-files -s >out &&
		test_line_count = 1 out &&
		git ls-files -u >out &&
		test_line_count = 0 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		echo 0 >expect &&
		git cat-file -p base:sub/file >>expect &&
		echo 7 >>expect &&
		test_cmp expect sub &&

		test_path_is_file sub
	)
'

# Test for all kinds of things that can go wrong with rename/rename (2to1):
#   Commit A: new files: a & b
#   Commit B: rename a->c, modify b
#   Commit C: rename b->c, modify a
#
# Merging of B & C should NOT be clean.  Questions:
#   * Both a & b should be removed by the merge; are they?
#   * The two c's should contain modifications to a & b; do they?
#   * The index should contain two files, both for c; does it?
#   * The working copy should have two files, both of form c~<unique>; does it?
#   * Nothing else should be present.  Is anything?

test_expect_success 'setup rename/rename (2to1) + modify/modify' '
	test_create_repo rename-rename-2to1 &&
	(
		cd rename-rename-2to1 &&

		printf "1\n2\n3\n4\n5\n" >a &&
		printf "5\n4\n3\n2\n1\n" >b &&
		git add a b &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		git mv a c &&
		echo 0 >>b &&
		git add b &&
		git commit -m B &&

		git checkout -b C A &&
		git mv b c &&
		echo 6 >>a &&
		git add a &&
		git commit -m C
	)
'

test_expect_success 'handle rename/rename (2to1) conflict correctly' '
	(
		cd rename-rename-2to1 &&

		git checkout B^0 &&

		test_must_fail git merge -s recursive C^0 >out &&
		test_i18ngrep "CONFLICT (rename/rename)" out &&

		git ls-files -s >out &&
		test_line_count = 2 out &&
		git ls-files -u >out &&
		test_line_count = 2 out &&
		git ls-files -u c >out &&
		test_line_count = 2 out &&
		git ls-files -o >out &&
		test_line_count = 3 out &&

		test_path_is_missing a &&
		test_path_is_missing b &&
		test_path_is_file c~HEAD &&
		test_path_is_file c~C^0 &&

		git rev-parse >expect   \
			C:a     B:b     &&
		git hash-object >actual \
			c~HEAD  c~C^0   &&
		test_cmp expect actual
	)
'

# Testcase setup for simple rename/rename (1to2) conflict:
#   Commit A: new file: a
#   Commit B: rename a->b
#   Commit C: rename a->c
test_expect_success 'setup simple rename/rename (1to2) conflict' '
	test_create_repo rename-rename-1to2 &&
	(
		cd rename-rename-1to2 &&

		echo stuff >a &&
		git add a &&
		test_tick &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		git mv a b &&
		test_tick &&
		git commit -m B &&

		git checkout -b C A &&
		git mv a c &&
		test_tick &&
		git commit -m C
	)
'

test_expect_success 'merge has correct working tree contents' '
	(
		cd rename-rename-1to2 &&

		git checkout C^0 &&

		test_must_fail git merge -s recursive B^0 &&

		git ls-files -s >out &&
		test_line_count = 3 out &&
		git ls-files -u >out &&
		test_line_count = 3 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		test_path_is_missing a &&
		git rev-parse >expect   \
			A:a   A:a   A:a \
			A:a   A:a       &&
		git rev-parse >actual    \
			:1:a  :3:b  :2:c &&
		git hash-object >>actual \
			b     c          &&
		test_cmp expect actual
	)
'

# Testcase setup for rename/rename(1to2)/add-source conflict:
#   Commit A: new file: a
#   Commit B: rename a->b
#   Commit C: rename a->c, add completely different a
#
# Merging of B & C should NOT be clean; there's a rename/rename conflict

test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
	test_create_repo rename-rename-1to2-add-source-1 &&
	(
		cd rename-rename-1to2-add-source-1 &&

		printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
		git add a &&
		git commit -m A &&
		git tag A &&

		git checkout -b B A &&
		git mv a b &&
		git commit -m B &&

		git checkout -b C A &&
		git mv a c &&
		echo something completely different >a &&
		git add a &&
		git commit -m C
	)
'

test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
	(
		cd rename-rename-1to2-add-source-1 &&

		git checkout B^0 &&

		test_must_fail git merge -s recursive C^0 &&

		git ls-files -s >out &&
		test_line_count = 4 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		git rev-parse >expect         \
			C:a   A:a   B:b   C:C &&
		git rev-parse >actual          \
			:3:a  :1:a  :2:b  :3:c &&
		test_cmp expect actual &&

		test_path_is_file a &&
		test_path_is_file b &&
		test_path_is_file c
	)
'

test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
	test_create_repo rename-rename-1to2-add-source-2 &&
	(
		cd rename-rename-1to2-add-source-2 &&

		>a &&
		git add a &&
		test_tick &&
		git commit -m base &&
		git tag A &&

		git checkout -b B A &&
		git mv a b &&
		test_tick &&
		git commit -m one &&

		git checkout -b C A &&
		git mv a b &&
		echo important-info >a &&
		git add a &&
		test_tick &&
		git commit -m two
	)
'

test_expect_failure 'rename/rename/add-source still tracks new a file' '
	(
		cd rename-rename-1to2-add-source-2 &&

		git checkout C^0 &&
		git merge -s recursive B^0 &&

		git ls-files -s >out &&
		test_line_count = 2 out &&
		git ls-files -o >out &&
		test_line_count = 1 out &&

		git rev-parse >expect \
			C:a   A:a     &&
		git rev-parse >actual \
			:0:a  :0:b    &&
		test_cmp expect actual
	)
'

test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
	test_create_repo rename-rename-1to2-add-dest &&
	(
		cd rename-rename-1to2-add-dest &&

		echo stuff >a &&
		git add a &&
		test_tick &&
		git commit -m base &&
		git tag A &&

		git checkout -b B A &&
		git mv a b &&
		echo precious-data >c &&
		git add c &&
		test_tick &&
		git commit -m one &&

		git checkout -b C A &&
		git mv a c &&
		echo important-info >b &&
		git add b &&
		test_tick &&
		git commit -m two
	)
'

test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
	(
		cd rename-rename-1to2-add-dest &&

		git checkout C^0 &&
		test_must_fail git merge -s recursive B^0 &&

		git ls-files -s >out &&
		test_line_count = 5 out &&
		git ls-files -u b >out &&
		test_line_count = 2 out &&
		git ls-files -u c >out &&
		test_line_count = 2 out &&
		git ls-files -o >out &&
		test_line_count = 5 out &&

		git rev-parse >expect               \
			A:a   C:b   B:b   C:c   B:c &&
		git rev-parse >actual                \
			:1:a  :2:b  :3:b  :2:c  :3:c &&
		test_cmp expect actual &&

		git rev-parse >expect               \
			C:c     B:c     C:b     B:b &&
		git hash-object >actual                \
			c~HEAD  c~B\^0  b~HEAD  b~B\^0 &&
		test_cmp expect actual &&

		test_path_is_missing b &&
		test_path_is_missing c
	)
'

test_done
Commit	Line	Data
695576fd EN	1	#!/bin/sh
	2
	3	test_description="recursive merge corner cases w/ renames but not criss-crosses"
	4	# t6036 has corner cases that involve both criss-cross merges and renames
	5
	6	. ./test-lib.sh
	7
	8	test_expect_success 'setup rename/delete + untracked file' '
2a4c19ef EN	9	test_create_repo rename-delete-untracked &&
	10	(
	11	cd rename-delete-untracked &&
	12
	13	echo "A pretty inscription" >ring &&
	14	git add ring &&
	15	test_tick &&
	16	git commit -m beginning &&
	17
	18	git branch people &&
	19	git checkout -b rename-the-ring &&
	20	git mv ring one-ring-to-rule-them-all &&
	21	test_tick &&
	22	git commit -m fullname &&
	23
	24	git checkout people &&
	25	git rm ring &&
	26	echo gollum >owner &&
	27	git add owner &&
	28	test_tick &&
	29	git commit -m track-people-instead-of-objects &&
	30	echo "Myyy PRECIOUSSS" >ring
	31	)
695576fd EN	32	'
695576fd EN	33
531357a4	34	test_expect_success "Does git preserve Gollum's precious artifact?" '
2a4c19ef EN	35	(
2a4c19ef EN	36	cd rename-delete-untracked &&
695576fd	37
2a4c19ef EN	38	test_must_fail git merge -s recursive rename-the-ring &&
	39
	40	# Make sure git did not delete an untracked file
5b0b9712	41	test_path_is_file ring
2a4c19ef	42	)
695576fd EN	43	'
695576fd EN	44
58040239 EN	45	# Testcase setup for rename/modify/add-source:
	46	# Commit A: new file: a
	47	# Commit B: modify a slightly
	48	# Commit C: rename a->b, add completely different a
	49	#
	50	# We should be able to merge B & C cleanly
	51
	52	test_expect_success 'setup rename/modify/add-source conflict' '
2a4c19ef EN	53	test_create_repo rename-modify-add-source &&
	54	(
	55	cd rename-modify-add-source &&
	56
	57	printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
	58	git add a &&
	59	git commit -m A &&
	60	git tag A &&
	61
	62	git checkout -b B A &&
	63	echo 8 >>a &&
	64	git add a &&
	65	git commit -m B &&
	66
	67	git checkout -b C A &&
	68	git mv a b &&
	69	echo something completely different >a &&
	70	git add a &&
	71	git commit -m C
	72	)
58040239 EN	73	'
	74
	75	test_expect_failure 'rename/modify/add-source conflict resolvable' '
2a4c19ef EN	76	(
	77	cd rename-modify-add-source &&
	78
	79	git checkout B^0 &&
58040239	80
2a4c19ef	81	git merge -s recursive C^0 &&
58040239	82
6ac767e5 EN	83	git rev-parse >expect \
	84	B:a C:a &&
	85	git rev-parse >actual \
	86	b c &&
	87	test_cmp expect actual
2a4c19ef	88	)
58040239 EN	89	'
58040239 EN	90
7b4ed594	91	test_expect_success 'setup resolvable conflict missed if rename missed' '
2a4c19ef EN	92	test_create_repo break-detection-1 &&
	93	(
	94	cd break-detection-1 &&
	95
	96	printf "1\n2\n3\n4\n5\n" >a &&
	97	echo foo >b &&
	98	git add a b &&
	99	git commit -m A &&
	100	git tag A &&
	101
	102	git checkout -b B A &&
	103	git mv a c &&
	104	echo "Completely different content" >a &&
	105	git add a &&
	106	git commit -m B &&
	107
	108	git checkout -b C A &&
	109	echo 6 >>a &&
	110	git add a &&
	111	git commit -m C
	112	)
7b4ed594 EN	113	'
	114
	115	test_expect_failure 'conflict caused if rename not detected' '
2a4c19ef EN	116	(
	117	cd break-detection-1 &&
	118
	119	git checkout -q C^0 &&
	120	git merge -s recursive B^0 &&
7b4ed594	121
0cdabc10 EN	122	git ls-files -s >out &&
	123	test_line_count = 3 out &&
	124	git ls-files -u >out &&
	125	test_line_count = 0 out &&
	126	git ls-files -o >out &&
	127	test_line_count = 1 out &&
7b4ed594	128
2a4c19ef	129	test_line_count = 6 c &&
6ac767e5 EN	130	git rev-parse >expect \
	131	B:a A:b &&
	132	git rev-parse >actual \
	133	:0:a :0:b &&
	134	test_cmp expect actual
2a4c19ef	135	)
7b4ed594 EN	136	'
	137
	138	test_expect_success 'setup conflict resolved wrong if rename missed' '
2a4c19ef EN	139	test_create_repo break-detection-2 &&
	140	(
	141	cd break-detection-2 &&
	142
	143	printf "1\n2\n3\n4\n5\n" >a &&
	144	echo foo >b &&
	145	git add a b &&
	146	git commit -m A &&
	147	git tag A &&
	148
	149	git checkout -b D A &&
	150	echo 7 >>a &&
	151	git add a &&
	152	git mv a c &&
	153	echo "Completely different content" >a &&
	154	git add a &&
	155	git commit -m D &&
	156
	157	git checkout -b E A &&
	158	git rm a &&
	159	echo "Completely different content" >>a &&
	160	git add a &&
	161	git commit -m E
	162	)
7b4ed594 EN	163	'
	164
	165	test_expect_failure 'missed conflict if rename not detected' '
2a4c19ef EN	166	(
	167	cd break-detection-2 &&
	168
	169	git checkout -q E^0 &&
	170	test_must_fail git merge -s recursive D^0
	171	)
7b4ed594 EN	172	'
7b4ed594 EN	173
a0551f21 EN	174	# Tests for undetected rename/add-source causing a file to erroneously be
	175	# deleted (and for mishandled rename/rename(1to1) causing the same issue).
	176	#
	177	# This test uses a rename/rename(1to1)+add-source conflict (1to1 means the
	178	# same file is renamed on both sides to the same thing; it should trigger
	179	# the 1to2 logic, which it would do if the add-source didn't cause issues
	180	# for git's rename detection):
	181	# Commit A: new file: a
	182	# Commit B: rename a->b
	183	# Commit C: rename a->b, add unrelated a
	184
	185	test_expect_success 'setup undetected rename/add-source causes data loss' '
2a4c19ef EN	186	test_create_repo break-detection-3 &&
	187	(
	188	cd break-detection-3 &&
	189
	190	printf "1\n2\n3\n4\n5\n" >a &&
	191	git add a &&
	192	git commit -m A &&
	193	git tag A &&
	194
	195	git checkout -b B A &&
	196	git mv a b &&
	197	git commit -m B &&
	198
	199	git checkout -b C A &&
	200	git mv a b &&
	201	echo foobar >a &&
	202	git add a &&
	203	git commit -m C
	204	)
a0551f21 EN	205	'
	206
	207	test_expect_failure 'detect rename/add-source and preserve all data' '
2a4c19ef EN	208	(
	209	cd break-detection-3 &&
	210
	211	git checkout B^0 &&
a0551f21	212
2a4c19ef	213	git merge -s recursive C^0 &&
a0551f21	214
0cdabc10 EN	215	git ls-files -s >out &&
	216	test_line_count = 2 out &&
	217	git ls-files -u >out &&
	218	test_line_count = 2 out &&
	219	git ls-files -o >out &&
	220	test_line_count = 1 out &&
a0551f21	221
5b0b9712 EN	222	test_path_is_file a &&
5b0b9712 EN	223	test_path_is_file b &&
a0551f21	224
6ac767e5 EN	225	git rev-parse >expect \
	226	A:a C:a &&
	227	git rev-parse >actual \
	228	:0:b :0:a &&
	229	test_cmp expect actual
2a4c19ef	230	)
a0551f21 EN	231	'
	232
	233	test_expect_failure 'detect rename/add-source and preserve all data, merge other way' '
2a4c19ef EN	234	(
2a4c19ef EN	235	cd break-detection-3 &&
a0551f21	236
2a4c19ef	237	git checkout C^0 &&
a0551f21	238
2a4c19ef	239	git merge -s recursive B^0 &&
a0551f21	240
0cdabc10 EN	241	git ls-files -s >out &&
	242	test_line_count = 2 out &&
	243	git ls-files -u >out &&
	244	test_line_count = 2 out &&
	245	git ls-files -o >out &&
	246	test_line_count = 1 out &&
a0551f21	247
5b0b9712 EN	248	test_path_is_file a &&
5b0b9712 EN	249	test_path_is_file b &&
2a4c19ef	250
6ac767e5 EN	251	git rev-parse >expect \
	252	A:a C:a &&
	253	git rev-parse >actual \
	254	:0:b :0:a &&
	255	test_cmp expect actual
2a4c19ef	256	)
a0551f21 EN	257	'
a0551f21 EN	258
ac6e8392	259	test_expect_success 'setup content merge + rename/directory conflict' '
2a4c19ef EN	260	test_create_repo rename-directory-1 &&
	261	(
	262	cd rename-directory-1 &&
	263
	264	printf "1\n2\n3\n4\n5\n6\n" >file &&
	265	git add file &&
	266	test_tick &&
	267	git commit -m base &&
	268	git tag base &&
	269
	270	git checkout -b right &&
	271	echo 7 >>file &&
	272	mkdir newfile &&
	273	echo junk >newfile/realfile &&
	274	git add file newfile/realfile &&
	275	test_tick &&
	276	git commit -m right &&
	277
	278	git checkout -b left-conflict base &&
	279	echo 8 >>file &&
	280	git add file &&
	281	git mv file newfile &&
	282	test_tick &&
	283	git commit -m left &&
	284
	285	git checkout -b left-clean base &&
	286	echo 0 >newfile &&
	287	cat file >>newfile &&
	288	git add newfile &&
	289	git rm file &&
	290	test_tick &&
	291	git commit -m left
	292	)
ac6e8392 EN	293	'
ac6e8392 EN	294
51931bf0	295	test_expect_success 'rename/directory conflict + clean content merge' '
2a4c19ef EN	296	(
2a4c19ef EN	297	cd rename-directory-1 &&
ac6e8392	298
2a4c19ef	299	git checkout left-clean^0 &&
ac6e8392	300
2a4c19ef	301	test_must_fail git merge -s recursive right^0 &&
ac6e8392	302
0cdabc10 EN	303	git ls-files -s >out &&
	304	test_line_count = 2 out &&
	305	git ls-files -u >out &&
	306	test_line_count = 1 out &&
	307	git ls-files -o >out &&
	308	test_line_count = 2 out &&
ac6e8392	309
2a4c19ef EN	310	echo 0 >expect &&
	311	git cat-file -p base:file >>expect &&
	312	echo 7 >>expect &&
	313	test_cmp expect newfile~HEAD &&
ac6e8392	314
2a4c19ef	315	test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
ac6e8392	316
5b0b9712 EN	317	test_path_is_file newfile/realfile &&
5b0b9712 EN	318	test_path_is_file newfile~HEAD
2a4c19ef	319	)
ac6e8392 EN	320	'
ac6e8392 EN	321
3c217c07	322	test_expect_success 'rename/directory conflict + content merge conflict' '
2a4c19ef EN	323	(
	324	cd rename-directory-1 &&
	325
	326	git reset --hard &&
	327	git reset --hard &&
	328	git clean -fdqx &&
	329
	330	git checkout left-conflict^0 &&
	331
	332	test_must_fail git merge -s recursive right^0 &&
	333
0cdabc10 EN	334	git ls-files -s >out &&
	335	test_line_count = 4 out &&
	336	git ls-files -u >out &&
	337	test_line_count = 3 out &&
	338	git ls-files -o >out &&
	339	test_line_count = 2 out &&
2a4c19ef EN	340
	341	git cat-file -p left-conflict:newfile >left &&
	342	git cat-file -p base:file >base &&
	343	git cat-file -p right:file >right &&
	344	test_must_fail git merge-file \
	345	-L "HEAD:newfile" \
	346	-L "" \
	347	-L "right^0:file" \
	348	left base right &&
	349	test_cmp left newfile~HEAD &&
	350
6ac767e5 EN	351	git rev-parse >expect \
	352	base:file left-conflict:newfile right:file &&
	353	git rev-parse >actual \
	354	:1:newfile :2:newfile :3:newfile &&
c8ce3763	355	test_cmp expect actual &&
2a4c19ef	356
5b0b9712 EN	357	test_path_is_file newfile/realfile &&
5b0b9712 EN	358	test_path_is_file newfile~HEAD
2a4c19ef	359	)
ac6e8392 EN	360	'
	361
	362	test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
2a4c19ef EN	363	test_create_repo rename-directory-2 &&
	364	(
	365	cd rename-directory-2 &&
	366
	367	mkdir sub &&
	368	printf "1\n2\n3\n4\n5\n6\n" >sub/file &&
	369	git add sub/file &&
	370	test_tick &&
	371	git commit -m base &&
	372	git tag base &&
	373
	374	git checkout -b right &&
	375	echo 7 >>sub/file &&
	376	git add sub/file &&
	377	test_tick &&
	378	git commit -m right &&
	379
	380	git checkout -b left base &&
	381	echo 0 >newfile &&
	382	cat sub/file >>newfile &&
	383	git rm sub/file &&
	384	mv newfile sub &&
	385	git add sub &&
	386	test_tick &&
	387	git commit -m left
	388	)
ac6e8392 EN	389	'
	390
	391	test_expect_success 'disappearing dir in rename/directory conflict handled' '
2a4c19ef EN	392	(
2a4c19ef EN	393	cd rename-directory-2 &&
ac6e8392	394
2a4c19ef	395	git checkout left^0 &&
ac6e8392	396
2a4c19ef	397	git merge -s recursive right^0 &&
ac6e8392	398
0cdabc10 EN	399	git ls-files -s >out &&
	400	test_line_count = 1 out &&
	401	git ls-files -u >out &&
	402	test_line_count = 0 out &&
	403	git ls-files -o >out &&
	404	test_line_count = 1 out &&
ac6e8392	405
2a4c19ef EN	406	echo 0 >expect &&
	407	git cat-file -p base:sub/file >>expect &&
	408	echo 7 >>expect &&
	409	test_cmp expect sub &&
ac6e8392	410
5b0b9712	411	test_path_is_file sub
2a4c19ef	412	)
ac6e8392 EN	413	'
ac6e8392 EN	414
f0b75fcc EN	415	# Test for all kinds of things that can go wrong with rename/rename (2to1):
	416	# Commit A: new files: a & b
	417	# Commit B: rename a->c, modify b
	418	# Commit C: rename b->c, modify a
	419	#
	420	# Merging of B & C should NOT be clean. Questions:
	421	# * Both a & b should be removed by the merge; are they?
	422	# * The two c's should contain modifications to a & b; do they?
	423	# * The index should contain two files, both for c; does it?
	424	# * The working copy should have two files, both of form c~<unique>; does it?
	425	# * Nothing else should be present. Is anything?
	426
	427	test_expect_success 'setup rename/rename (2to1) + modify/modify' '
2a4c19ef EN	428	test_create_repo rename-rename-2to1 &&
	429	(
	430	cd rename-rename-2to1 &&
	431
	432	printf "1\n2\n3\n4\n5\n" >a &&
	433	printf "5\n4\n3\n2\n1\n" >b &&
	434	git add a b &&
	435	git commit -m A &&
	436	git tag A &&
	437
	438	git checkout -b B A &&
	439	git mv a c &&
	440	echo 0 >>b &&
	441	git add b &&
	442	git commit -m B &&
	443
	444	git checkout -b C A &&
	445	git mv b c &&
	446	echo 6 >>a &&
	447	git add a &&
	448	git commit -m C
	449	)
f0b75fcc EN	450	'
f0b75fcc EN	451
434b8525	452	test_expect_success 'handle rename/rename (2to1) conflict correctly' '
2a4c19ef EN	453	(
	454	cd rename-rename-2to1 &&
	455
	456	git checkout B^0 &&
f0b75fcc	457
2a4c19ef EN	458	test_must_fail git merge -s recursive C^0 >out &&
2a4c19ef EN	459	test_i18ngrep "CONFLICT (rename/rename)" out &&
f0b75fcc	460
0cdabc10 EN	461	git ls-files -s >out &&
	462	test_line_count = 2 out &&
	463	git ls-files -u >out &&
	464	test_line_count = 2 out &&
	465	git ls-files -u c >out &&
	466	test_line_count = 2 out &&
	467	git ls-files -o >out &&
	468	test_line_count = 3 out &&
f0b75fcc	469
5b0b9712 EN	470	test_path_is_missing a &&
	471	test_path_is_missing b &&
	472	test_path_is_file c~HEAD &&
	473	test_path_is_file c~C^0 &&
f0b75fcc	474
6ac767e5 EN	475	git rev-parse >expect \
	476	C:a B:b &&
	477	git hash-object >actual \
	478	c~HEAD c~C^0 &&
	479	test_cmp expect actual
2a4c19ef	480	)
f0b75fcc EN	481	'
	482
	483	# Testcase setup for simple rename/rename (1to2) conflict:
	484	# Commit A: new file: a
	485	# Commit B: rename a->b
	486	# Commit C: rename a->c
	487	test_expect_success 'setup simple rename/rename (1to2) conflict' '
2a4c19ef EN	488	test_create_repo rename-rename-1to2 &&
	489	(
	490	cd rename-rename-1to2 &&
	491
	492	echo stuff >a &&
	493	git add a &&
	494	test_tick &&
	495	git commit -m A &&
	496	git tag A &&
	497
	498	git checkout -b B A &&
	499	git mv a b &&
	500	test_tick &&
	501	git commit -m B &&
	502
	503	git checkout -b C A &&
	504	git mv a c &&
	505	test_tick &&
	506	git commit -m C
	507	)
f0b75fcc EN	508	'
	509
	510	test_expect_success 'merge has correct working tree contents' '
2a4c19ef EN	511	(
	512	cd rename-rename-1to2 &&
	513
	514	git checkout C^0 &&
f0b75fcc	515
2a4c19ef	516	test_must_fail git merge -s recursive B^0 &&
f0b75fcc	517
0cdabc10 EN	518	git ls-files -s >out &&
	519	test_line_count = 3 out &&
	520	git ls-files -u >out &&
	521	test_line_count = 3 out &&
	522	git ls-files -o >out &&
	523	test_line_count = 1 out &&
f0b75fcc	524
5b0b9712	525	test_path_is_missing a &&
6ac767e5 EN	526	git rev-parse >expect \
	527	A:a A:a A:a \
	528	A:a A:a &&
	529	git rev-parse >actual \
	530	:1:a :3:b :2:c &&
	531	git hash-object >>actual \
	532	b c &&
	533	test_cmp expect actual
2a4c19ef	534	)
f0b75fcc EN	535	'
f0b75fcc EN	536
c6966068 EN	537	# Testcase setup for rename/rename(1to2)/add-source conflict:
	538	# Commit A: new file: a
	539	# Commit B: rename a->b
	540	# Commit C: rename a->c, add completely different a
	541	#
	542	# Merging of B & C should NOT be clean; there's a rename/rename conflict
	543
	544	test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
2a4c19ef EN	545	test_create_repo rename-rename-1to2-add-source-1 &&
	546	(
	547	cd rename-rename-1to2-add-source-1 &&
	548
	549	printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
	550	git add a &&
	551	git commit -m A &&
	552	git tag A &&
	553
	554	git checkout -b B A &&
	555	git mv a b &&
	556	git commit -m B &&
	557
	558	git checkout -b C A &&
	559	git mv a c &&
	560	echo something completely different >a &&
	561	git add a &&
	562	git commit -m C
	563	)
c6966068 EN	564	'
	565
	566	test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
2a4c19ef EN	567	(
2a4c19ef EN	568	cd rename-rename-1to2-add-source-1 &&
c6966068	569
2a4c19ef	570	git checkout B^0 &&
c6966068	571
2a4c19ef	572	test_must_fail git merge -s recursive C^0 &&
c6966068	573
0cdabc10 EN	574	git ls-files -s >out &&
	575	test_line_count = 4 out &&
	576	git ls-files -o >out &&
	577	test_line_count = 1 out &&
c6966068	578
6ac767e5 EN	579	git rev-parse >expect \
	580	C:a A:a B:b C:C &&
	581	git rev-parse >actual \
	582	:3:a :1:a :2:b :3:c &&
c8ce3763	583	test_cmp expect actual &&
2a4c19ef	584
5b0b9712 EN	585	test_path_is_file a &&
	586	test_path_is_file b &&
	587	test_path_is_file c
2a4c19ef	588	)
c6966068 EN	589	'
	590
	591	test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
2a4c19ef EN	592	test_create_repo rename-rename-1to2-add-source-2 &&
	593	(
	594	cd rename-rename-1to2-add-source-2 &&
	595
	596	>a &&
	597	git add a &&
	598	test_tick &&
	599	git commit -m base &&
	600	git tag A &&
	601
	602	git checkout -b B A &&
	603	git mv a b &&
	604	test_tick &&
	605	git commit -m one &&
	606
	607	git checkout -b C A &&
	608	git mv a b &&
	609	echo important-info >a &&
	610	git add a &&
	611	test_tick &&
	612	git commit -m two
	613	)
c6966068 EN	614	'
	615
	616	test_expect_failure 'rename/rename/add-source still tracks new a file' '
2a4c19ef EN	617	(
	618	cd rename-rename-1to2-add-source-2 &&
	619
	620	git checkout C^0 &&
	621	git merge -s recursive B^0 &&
c6966068	622
0cdabc10 EN	623	git ls-files -s >out &&
	624	test_line_count = 2 out &&
	625	git ls-files -o >out &&
	626	test_line_count = 1 out &&
c6966068	627
6ac767e5 EN	628	git rev-parse >expect \
	629	C:a A:a &&
	630	git rev-parse >actual \
	631	:0:a :0:b &&
	632	test_cmp expect actual
2a4c19ef	633	)
c6966068 EN	634	'
	635
	636	test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
2a4c19ef EN	637	test_create_repo rename-rename-1to2-add-dest &&
	638	(
	639	cd rename-rename-1to2-add-dest &&
	640
	641	echo stuff >a &&
	642	git add a &&
	643	test_tick &&
	644	git commit -m base &&
	645	git tag A &&
	646
	647	git checkout -b B A &&
	648	git mv a b &&
	649	echo precious-data >c &&
	650	git add c &&
	651	test_tick &&
	652	git commit -m one &&
	653
	654	git checkout -b C A &&
	655	git mv a c &&
	656	echo important-info >b &&
	657	git add b &&
	658	test_tick &&
	659	git commit -m two
	660	)
c6966068 EN	661	'
c6966068 EN	662
1ac91b32	663	test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
2a4c19ef EN	664	(
	665	cd rename-rename-1to2-add-dest &&
	666
	667	git checkout C^0 &&
	668	test_must_fail git merge -s recursive B^0 &&
	669
0cdabc10 EN	670	git ls-files -s >out &&
	671	test_line_count = 5 out &&
	672	git ls-files -u b >out &&
	673	test_line_count = 2 out &&
	674	git ls-files -u c >out &&
	675	test_line_count = 2 out &&
	676	git ls-files -o >out &&
	677	test_line_count = 5 out &&
2a4c19ef	678
6ac767e5 EN	679	git rev-parse >expect \
	680	A:a C:b B:b C:c B:c &&
	681	git rev-parse >actual \
	682	:1:a :2:b :3:b :2:c :3:c &&
c8ce3763	683	test_cmp expect actual &&
6ac767e5 EN	684
	685	git rev-parse >expect \
	686	C:c B:c C:b B:b &&
	687	git hash-object >actual \
	688	c~HEAD c~B\^0 b~HEAD b~B\^0 &&
c8ce3763	689	test_cmp expect actual &&
2a4c19ef	690
5b0b9712 EN	691	test_path_is_missing b &&
5b0b9712 EN	692	test_path_is_missing c
2a4c19ef	693	)
c6966068 EN	694	'
c6966068 EN	695
695576fd	696	test_done