git/t/t6425-merge-rename-delete.sh

29 lines
666 B
Bash
Executable File

#!/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