git-apply: require -p<n> when working in a subdirectory.

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 0e8ea7e2b8f24edea491cdf865c77158725f89fa..816b5b8fb2388e59d99532f49a5c46f81dfc8125 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -10,20 +10,22 @@ test_description='git-apply --whitespace=strip and configuration file.
 . ./test-lib.sh
 
 test_expect_success setup '
-       echo A >file1 &&
-       cp file1 saved &&
-       git add file1 &&
-       echo "B " >file1 &&
+       mkdir sub &&
+       echo A >sub/file1 &&
+       cp sub/file1 saved &&
+       git add sub/file1 &&
+       echo "B " >sub/file1 &&
        git diff >patch.file
 '
 
 test_expect_success 'apply --whitespace=strip' '
 
-       cp saved file1 &&
+       rm -f sub/file1 &&
+       cp saved sub/file1 &&
        git update-index --refresh &&
 
        git apply --whitespace=strip patch.file &&
-       if grep " " file1
+       if grep " " sub/file1
        then
                echo "Eh?"
                false
@@ -34,12 +36,13 @@ test_expect_success 'apply --whitespace=strip' '
 
 test_expect_success 'apply --whitespace=strip from config' '
 
-       cp saved file1 &&
+       rm -f sub/file1 &&
+       cp saved sub/file1 &&
        git update-index --refresh &&
 
        git config apply.whitespace strip &&
        git apply patch.file &&
-       if grep " " file1
+       if grep " " sub/file1
        then
                echo "Eh?"
                false
@@ -48,19 +51,19 @@ test_expect_success 'apply --whitespace=strip from config' '
        fi
 '
 
-mkdir sub
 D=`pwd`
 
 test_expect_success 'apply --whitespace=strip in subdir' '
 
        cd "$D" &&
        git config --unset-all apply.whitespace
-       cp saved file1 &&
+       rm -f sub/file1 &&
+       cp saved sub/file1 &&
        git update-index --refresh &&
 
        cd sub &&
-       git apply --whitespace=strip ../patch.file &&
-       if grep " " ../file1
+       git apply --whitespace=strip -p2 ../patch.file &&
+       if grep " " file1
        then
                echo "Eh?"
                false
@@ -73,11 +76,12 @@ test_expect_success 'apply --whitespace=strip from config in subdir' '
 
        cd "$D" &&
        git config apply.whitespace strip &&
-       cp saved file1 &&
+       rm -f sub/file1 &&
+       cp saved sub/file1 &&
        git update-index --refresh &&
 
        cd sub &&
-       git apply ../patch.file &&
+       git apply -p2 ../patch.file &&
        if grep " " file1
        then
                echo "Eh?"