pull: support pull.ff config

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 4df7a2f212c6704d2fd52af66893bc84a9aa3cb6..cc5b870e5875bab8326393aea3a8d9f944210de6 100755 (executable)
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '
        mkdir work &&
        mkdir -p repo.git/repos/foo &&
        cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
+       test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
        sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
 '