Merge branch 'sb/submodule-parallel-update' into next

diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 3afe0125c99f037b9f144806c00435dcba3f93ea..9670e8cbe6cb9a9faa3519b0f11dc16713496188 100755 (executable)
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '
        test "$SHA" = "$(git rev-list HEAD)"
 '
 
-test_expect_failure 'setup_git_dir twice in subdir' '
+test_expect_success 'setup_git_dir twice in subdir' '
        git init sgd &&
        (
                cd sgd &&