This only changes the last patch to correct the test prerequisite and
a couple minor refinements. Interdiff:
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 5494389dbb..d2a8e0312a 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -401,7 +401,7 @@ done <<\EOF
0642 -rw-r---w-
EOF
-test_expect_success POSIXPERM 'graceful handling splitting index is not
allowed' '
+test_expect_success SANITY 'graceful handling when splitting index is not
allowed' '
test_create_repo ro &&
(
cd ro &&
@@ -409,11 +409,11 @@ test_expect_success POSIXPERM 'graceful handling
splitting index is not allowed'
git update-index --split-index &&
test -f .git/sharedindex.*
) &&
- test_when_finished "chmod -R u+w ro" &&
- chmod -R u-w ro &&
cp ro/.git/index new-index &&
+ test_when_finished "chmod u+w ro/.git" &&
+ chmod u-w ro/.git &&
GIT_INDEX_FILE="$(pwd)/new-index" git -C ro update-index --split-index
&&
- chmod -R u+w ro &&
+ chmod u+w ro/.git &&
rm ro/.git/sharedindex.* &&
GIT_INDEX_FILE=new-index git ls-files >actual &&
echo initial.t >expected &&
Nguyễn Thái Ngọc Duy (3):
read-cache.c: change type of "temp" in write_shared_index()
read-cache.c: move tempfile creation/cleanup out of write_shared_index
read-cache: don't write index twice if we can't write shared index
read-cache.c | 40 ++++++++++++++++++++++------------------
t/t1700-split-index.sh | 19 +++++++++++++++++++
2 files changed, 41 insertions(+), 18 deletions(-)
--
2.16.0.47.g3d9b0fac3a
