submodule sync: Update "submodule.<name>.url" for empty directories

diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index b463b4f05ce43ee345a0594528d684befe7c2ef3..2b2d00b33410282b6decd0af9118ee3f79489e34 100755 (executable)
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -10,21 +10,50 @@ test_description='git apply -p handling.'
 test_expect_success setup '
        mkdir sub &&
        echo A >sub/file1 &&
-       cp sub/file1 file1 &&
+       cp sub/file1 file1.saved &&
        git add sub/file1 &&
        echo B >sub/file1 &&
        git diff >patch.file &&
-       rm sub/file1 &&
-       rmdir sub
+       git checkout -- sub/file1 &&
+       git mv sub süb &&
+       echo B >süb/file1 &&
+       git diff >patch.escaped &&
+       grep "[\]" patch.escaped &&
+       rm süb/file1 &&
+       rmdir süb
 '
 
 test_expect_success 'apply git diff with -p2' '
+       cp file1.saved file1 &&
        git apply -p2 patch.file
 '
 
 test_expect_success 'apply with too large -p' '
+       cp file1.saved file1 &&
        test_must_fail git apply --stat -p3 patch.file 2>err &&
        grep "removing 3 leading" err
 '
 
+test_expect_success 'apply (-p2) traditional diff with funny filenames' '
+       cat >patch.quotes <<-\EOF &&
+       diff -u "a/"sub/file1 "b/"sub/file1
+       --- "a/"sub/file1
+       +++ "b/"sub/file1
+       @@ -1 +1 @@
+       -A
+       +B
+       EOF
+       echo B >expected &&
+
+       cp file1.saved file1 &&
+       git apply -p2 patch.quotes &&
+       test_cmp expected file1
+'
+
+test_expect_success 'apply with too large -p and fancy filename' '
+       cp file1.saved file1 &&
+       test_must_fail git apply --stat -p3 patch.escaped 2>err &&
+       grep "removing 3 leading" err
+'
+
 test_done