Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files

diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index c087b6336788054671a307759a9ac67654b624da..a66936fe9bde2ba20ab0e57400b6286b0710212a 100755 (executable)
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -401,6 +401,25 @@ done <<\EOF
 0642 -rw-r---w-
 EOF
 
+test_expect_success POSIXPERM,SANITY 'graceful handling when splitting index is not allowed' '
+       test_create_repo ro &&
+       (
+               cd ro &&
+               test_commit initial &&
+               git update-index --split-index &&
+               test -f .git/sharedindex.*
+       ) &&
+       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 u+w ro/.git &&
+       rm ro/.git/sharedindex.* &&
+       GIT_INDEX_FILE=new-index git ls-files >actual &&
+       echo initial.t >expected &&
+       test_cmp expected actual
+'
+
 test_expect_success 'writing split index with null sha1 does not write cache tree' '
        git config core.splitIndex true &&
        git config splitIndex.maxPercentChange 0 &&