Respect core.autocrlf in combined diff

diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index 80b5af2b412d3ecec20bc787261b44af363ea1d1..2dd0c75f964b690977e40a3a8235cc324dc6826e 100755 (executable)
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -8,7 +8,9 @@ test_expect_success 'setup' '
 
        mkdir -p some/sub/dir &&
        echo Hello > some/sub/dir/file &&
-       git add some/sub/dir/file
+       git add some/sub/dir/file &&
+       git commit -m initial &&
+       git tag initial
 
 '
 
@@ -21,9 +23,18 @@ diff a/bla/blub/dir/file b/bla/blub/dir/file
 +Bello
 EOF
 
-test_expect_success 'apply --root -p --index' '
+test_expect_success 'apply --directory -p (1)' '
 
-       git apply --root=some/sub -p3 --index patch &&
+       git apply --directory=some/sub -p3 --index patch &&
+       test Bello = $(git show :some/sub/dir/file) &&
+       test Bello = $(cat some/sub/dir/file)
+
+'
+
+test_expect_success 'apply --directory -p (2) ' '
+
+       git reset --hard initial &&
+       git apply --directory=some/sub/ -p3 --index patch &&
        test Bello = $(git show :some/sub/dir/file) &&
        test Bello = $(cat some/sub/dir/file)