Merge branch 'sg/fsck-config-in-doc'

diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 94fcb4a78e661ae793eef54ae98b4821218b1e29..ce9a4a5f324b74d61d8f0c8abcaee866cbe874e9 100755 (executable)
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -162,8 +162,8 @@ test_expect_success PERL 'commit --interactive gives cache-tree on partial commi
 '
 
 test_expect_success PERL 'commit -p with shrinking cache-tree' '
-       mkdir -p deep/subdir &&
-       echo content >deep/subdir/file &&
+       mkdir -p deep/very-long-subdir &&
+       echo content >deep/very-long-subdir/file &&
        git add deep &&
        git commit -m add &&
        git rm -r deep &&
@@ -261,13 +261,16 @@ test_expect_success 'no phantom error when switching trees' '
 '
 
 test_expect_success 'switching trees does not invalidate shared index' '
-       git update-index --split-index &&
-       >split &&
-       git add split &&
-       test-tool dump-split-index .git/index | grep -v ^own >before &&
-       git commit -m "as-is" &&
-       test-tool dump-split-index .git/index | grep -v ^own >after &&
-       test_cmp before after
+       (
+               sane_unset GIT_TEST_SPLIT_INDEX &&
+               git update-index --split-index &&
+               >split &&
+               git add split &&
+               test-tool dump-split-index .git/index | grep -v ^own >before &&
+               git commit -m "as-is" &&
+               test-tool dump-split-index .git/index | grep -v ^own >after &&
+               test_cmp before after
+       )
 '
 
 test_done