Merge branch 'mm/p4-unshelve-windows-fix' into maint

diff --git a/t/t3401-rebase-and-am-rename.sh b/t/t3401-rebase-and-am-rename.sh
index 887bed53962dec12a9c45567ab987fb8c78fe3f9..a0b9438b2286712c41fb0d5648e8bf29caee8842 100755 (executable)
--- a/t/t3401-rebase-and-am-rename.sh
+++ b/t/t3401-rebase-and-am-rename.sh
@@ -42,7 +42,7 @@ test_expect_success 'rebase --interactive: directory rename detected' '
                git checkout B^0 &&
 
                set_fake_editor &&
-               FAKE_LINES="1" git rebase --interactive A &&
+               FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
 
                git ls-files -s >out &&
                test_line_count = 5 out &&
@@ -58,7 +58,7 @@ test_expect_failure 'rebase (am): directory rename detected' '
 
                git checkout B^0 &&
 
-               git rebase A &&
+               git -c merge.directoryRenames=true rebase A &&
 
                git ls-files -s >out &&
                test_line_count = 5 out &&
@@ -74,7 +74,7 @@ test_expect_success 'rebase --merge: directory rename detected' '
 
                git checkout B^0 &&
 
-               git rebase --merge A &&
+               git -c merge.directoryRenames=true rebase --merge A &&
 
                git ls-files -s >out &&
                test_line_count = 5 out &&
@@ -92,7 +92,7 @@ test_expect_failure 'am: directory rename detected' '
 
                git format-patch -1 B &&
 
-               git am --3way 0001*.patch &&
+               git -c merge.directoryRenames=true am --3way 0001*.patch &&
 
                git ls-files -s >out &&
                test_line_count = 5 out &&
@@ -152,7 +152,7 @@ test_expect_success 'rebase --interactive: NO directory rename' '
        )
 '
 
-test_expect_failure 'rebase (am): NO directory rename' '
+test_expect_success 'rebase (am): NO directory rename' '
        test_when_finished "git -C no-dir-rename rebase --abort" &&
        (
                cd no-dir-rename &&
@@ -190,7 +190,7 @@ test_expect_success 'rebase --merge: NO directory rename' '
        )
 '
 
-test_expect_failure 'am: NO directory rename' '
+test_expect_success 'am: NO directory rename' '
        test_when_finished "git -C no-dir-rename am --abort" &&
        (
                cd no-dir-rename &&