mirror of
https://github.com/git/git.git
synced 2024-12-26 18:24:21 +08:00
5902f5f460
This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t6[4-9]*.sh) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
28 lines
643 B
Bash
Executable File
28 lines
643 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-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_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
|
|
test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
|
|
'
|
|
|
|
test_done
|