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 8f832957fc38110b7653ad0a058172ed9fc8bf1f..a0b9438b2286712c41fb0d5648e8bf29caee8842 100755 (executable)
--- a/t/t3401-rebase-and-am-rename.sh
+++ b/t/t3401-rebase-and-am-rename.sh
@@ -5,7 +5,7 @@ test_description='git rebase + directory rename tests'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
-test_expect_success 'setup testcase' '
+test_expect_success 'setup testcase where directory rename should be detected' '
        test_create_repo dir-rename &&
        (
                cd dir-rename &&
@@ -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 &&
@@ -102,4 +102,112 @@ test_expect_failure 'am: directory rename detected' '
        )
 '
 
+test_expect_success 'setup testcase where directory rename should NOT be detected' '
+       test_create_repo no-dir-rename &&
+       (
+               cd no-dir-rename &&
+
+               mkdir x &&
+               test_seq  1 10 >x/a &&
+               test_seq 11 20 >x/b &&
+               test_seq 21 30 >x/c &&
+               echo original >project_info &&
+               git add x project_info &&
+               git commit -m "Initial" &&
+
+               git branch O &&
+               git branch A &&
+               git branch B &&
+
+               git checkout A &&
+               echo v2 >project_info &&
+               git add project_info &&
+               git commit -m "Modify project_info" &&
+
+               git checkout B &&
+               mkdir y &&
+               git mv x/c y/c &&
+               echo v1 >project_info &&
+               git add project_info &&
+               git commit -m "Rename x/c to y/c, modify project_info"
+       )
+'
+
+test_expect_success 'rebase --interactive: NO directory rename' '
+       test_when_finished "git -C no-dir-rename rebase --abort" &&
+       (
+               cd no-dir-rename &&
+
+               git checkout B^0 &&
+
+               set_fake_editor &&
+               test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
+
+               git ls-files -s >out &&
+               test_line_count = 6 out &&
+
+               test_path_is_file x/a &&
+               test_path_is_file x/b &&
+               test_path_is_missing x/c
+       )
+'
+
+test_expect_success 'rebase (am): NO directory rename' '
+       test_when_finished "git -C no-dir-rename rebase --abort" &&
+       (
+               cd no-dir-rename &&
+
+               git checkout B^0 &&
+
+               set_fake_editor &&
+               test_must_fail git rebase A &&
+
+               git ls-files -s >out &&
+               test_line_count = 6 out &&
+
+               test_path_is_file x/a &&
+               test_path_is_file x/b &&
+               test_path_is_missing x/c
+       )
+'
+
+test_expect_success 'rebase --merge: NO directory rename' '
+       test_when_finished "git -C no-dir-rename rebase --abort" &&
+       (
+               cd no-dir-rename &&
+
+               git checkout B^0 &&
+
+               set_fake_editor &&
+               test_must_fail git rebase --merge A &&
+
+               git ls-files -s >out &&
+               test_line_count = 6 out &&
+
+               test_path_is_file x/a &&
+               test_path_is_file x/b &&
+               test_path_is_missing x/c
+       )
+'
+
+test_expect_success 'am: NO directory rename' '
+       test_when_finished "git -C no-dir-rename am --abort" &&
+       (
+               cd no-dir-rename &&
+
+               git checkout A^0 &&
+
+               git format-patch -1 B &&
+
+               test_must_fail git am --3way 0001*.patch &&
+
+               git ls-files -s >out &&
+               test_line_count = 6 out &&
+
+               test_path_is_file x/a &&
+               test_path_is_file x/b &&
+               test_path_is_missing x/c
+       )
+'
+
 test_done