Merge branch 'ar/clean-rmdir-empty' into maint

[git.git] / t / t4119-apply-config.sh

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index b540f7295a1bb48bf044d297201b07aca9fb5005..3d0384daa8a7b7369826b05bcb793cb445c3f9ee 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -19,12 +19,12 @@ test_expect_success setup '
 '
 
 # Also handcraft GNU diff output; note this has trailing whitespace.
-cat >gpatch.file <<\EOF &&
+tr '_' ' ' >gpatch.file <<\EOF &&
 --- file1      2007-02-21 01:04:24.000000000 -0800
 +++ file1+     2007-02-21 01:07:44.000000000 -0800
 @@ -1 +1 @@
 -A
-+B 
++B_
 EOF
 
 sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&
@@ -73,7 +73,7 @@ D=`pwd`
 test_expect_success 'apply --whitespace=strip in subdir' '
 
        cd "$D" &&
-       git config --unset-all apply.whitespace
+       git config --unset-all apply.whitespace &&
        rm -f sub/file1 &&
        cp saved sub/file1 &&
        git update-index --refresh &&