Merge branch 'fc/fetch-with-import-fix'

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 84431c097eb8dffa1b540ee61d6c047239afd18a..cdd291344047394b26c17635d4507ad7ce14b542 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -3,11 +3,14 @@
 # Build and test Git
 #
 
-. ${0%/*}/lib-travisci.sh
+. ${0%/*}/lib.sh
 
-ln -s "$cache_dir/.prove" t/.prove
+case "$CI_OS_NAME" in
+windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+*) ln -s "$cache_dir/.prove" t/.prove;;
+esac
 
-make --jobs=2
+make
 make test
 if test "$jobname" = "linux-gcc"
 then