[thirdparty/git.git] / t / t6425-merge-rename-delete.sh

#!/bin/sh

test_description='Merge-recursive rename/delete conflict message'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

test_expect_success 'rename/delete' '
	echo foo >A &&
	git add A &&
	git commit -m "initial" &&

	git checkout -b rename &&
	git mv A B &&
	git commit -m "rename" &&

	git checkout main &&
	git rm A &&
	git commit -m "delete" &&

	test_must_fail git merge --strategy=recursive rename >output &&
	test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
'

test_done
Commit	Line	Data
b26d87f2 MM	1	#!/bin/sh
	2
	3	test_description='Merge-recursive rename/delete conflict message'
5902f5f4	4	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
334afbc7 JS	5	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
334afbc7 JS	6
3e3b9321	7	TEST_PASSES_SANITIZE_LEAK=true
b26d87f2 MM	8	. ./test-lib.sh
	9
	10	test_expect_success 'rename/delete' '
	11	echo foo >A &&
	12	git add A &&
	13	git commit -m "initial" &&
	14
	15	git checkout -b rename &&
	16	git mv A B &&
	17	git commit -m "rename" &&
	18
5902f5f4	19	git checkout main &&
b26d87f2 MM	20	git rm A &&
	21	git commit -m "delete" &&
	22
	23	test_must_fail git merge --strategy=recursive rename >output &&
6789275d JH	24	test_grep "CONFLICT (rename/delete): A.* renamed .to B. in rename" output &&
6789275d JH	25	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
b26d87f2 MM	26	'
	27
	28	test_done