Merge branch 'jk/add-e-doc'

diff --git a/t/t4111-apply-subdir.sh b/t/t4111-apply-subdir.sh
index 60c223750f64dc9c1148eea9dc4bad19dec5f3da..7c398432bad761c1b38c6d15548bed0c389221fd 100755 (executable)
--- a/t/t4111-apply-subdir.sh
+++ b/t/t4111-apply-subdir.sh
@@ -36,7 +36,8 @@ test_expect_success 'setup: subdir' '
                cp "$2" file &&
                cp "$2" sub/dir/file &&
                cp "$2" sub/dir/b/file &&
-               cp "$2" objects/file
+               cp "$2" objects/file &&
+               test_might_fail git update-index --refresh -q
        }
 '
 
@@ -88,7 +89,7 @@ test_expect_success 'apply --index from subdir of toplevel' '
 test_expect_success 'apply from .git dir' '
        cp postimage expected &&
        cp preimage .git/file &&
-       cp preimage .git/objects/file
+       cp preimage .git/objects/file &&
        (
                cd .git &&
                git apply "$patch"
@@ -96,10 +97,10 @@ test_expect_success 'apply from .git dir' '
        test_cmp expected .git/file
 '
 
-test_expect_failure 'apply from subdir of .git dir' '
+test_expect_success 'apply from subdir of .git dir' '
        cp postimage expected &&
        cp preimage .git/file &&
-       cp preimage .git/objects/file
+       cp preimage .git/objects/file &&
        (
                cd .git/objects &&
                git apply "$patch"