Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash

[git.git] / t / t6022-merge-rename.sh

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 5f3b604fd99b22c73cfdebf0f1cf13539e1af3e4..1ed259d864b4ef4c8c7060fa5f22634a25c8e032 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -609,67 +609,4 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
        ! test -f original
 '
 
-test_expect_success 'setup avoid unnecessary update, normal rename' '
-       git reset --hard &&
-       git checkout --orphan avoid-unnecessary-update-1 &&
-       git rm -rf . &&
-       git clean -fdqx &&
-
-       printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
-       git add -A &&
-       git commit -m "Common commmit" &&
-
-       git mv original rename &&
-       echo 11 >>rename &&
-       git add -u &&
-       git commit -m "Renamed and modified" &&
-
-       git checkout -b merge-branch-1 HEAD~1 &&
-       echo "random content" >random-file &&
-       git add -A &&
-       git commit -m "Random, unrelated changes"
-'
-
-test_expect_success 'avoid unnecessary update, normal rename' '
-       git checkout -q avoid-unnecessary-update-1^0 &&
-       test-chmtime =1000000000 rename &&
-       test-chmtime -v +0 rename >expect &&
-       git merge merge-branch-1 &&
-       test-chmtime -v +0 rename >actual &&
-       test_cmp expect actual # "rename" should have stayed intact
-'
-
-test_expect_success 'setup to test avoiding unnecessary update, with D/F conflict' '
-       git reset --hard &&
-       git checkout --orphan avoid-unnecessary-update-2 &&
-       git rm -rf . &&
-       git clean -fdqx &&
-
-       mkdir df &&
-       printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
-       git add -A &&
-       git commit -m "Common commmit" &&
-
-       git mv df/file temp &&
-       rm -rf df &&
-       git mv temp df &&
-       echo 11 >>df &&
-       git add -u &&
-       git commit -m "Renamed and modified" &&
-
-       git checkout -b merge-branch-2 HEAD~1 &&
-       >unrelated-change &&
-       git add unrelated-change &&
-       git commit -m "Only unrelated changes"
-'
-
-test_expect_failure 'avoid unnecessary update, with D/F conflict' '
-       git checkout -q avoid-unnecessary-update-2^0 &&
-       test-chmtime =1000000000 df &&
-       test-chmtime -v +0 df >expect &&
-       git merge merge-branch-2 &&
-       test-chmtime -v +0 df >actual &&
-       test_cmp expect actual # "df" should have stayed intact
-'
-
 test_done