diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
| commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
| tree | 24e09d9f84dec336720cf393e156089ca2835791 /t/t6425-merge-rename-delete.sh | |
| parent | Initial commit. (diff) | |
| download | git-c8bae7493d2f2910b57f13ded012e86bdcfb0532.tar.xz git-c8bae7493d2f2910b57f13ded012e86bdcfb0532.zip | |
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rwxr-xr-x | t/t6425-merge-rename-delete.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t6425-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh new file mode 100755 index 0000000..93cd286 --- /dev/null +++ b/t/t6425-merge-rename-delete.sh @@ -0,0 +1,28 @@ +#!/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_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output && + test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output +' + +test_done |