Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index 9965bc5c92445160895ae3ea426c5caf1b3458b3..c8de6d8a1902209ef98ec0832296ed9060310429 100755 (executable)
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -4,11 +4,20 @@ test_description='cd_to_toplevel'
 
 . ./test-lib.sh
 
+EXEC_PATH="$(git --exec-path)"
+test_have_prereq !MINGW ||
+case "$EXEC_PATH" in
+[A-Za-z]:/*)
+       EXEC_PATH="/${EXEC_PATH%%:*}${EXEC_PATH#?:}"
+       ;;
+esac
+
 test_cd_to_toplevel () {
        test_expect_success $3 "$2" '
                (
                        cd '"'$1'"' &&
-                       . "$(git --exec-path)"/git-sh-setup &&
+                       PATH="$EXEC_PATH:$PATH" &&
+                       . git-sh-setup &&
                        cd_to_toplevel &&
                        [ "$(pwd -P)" = "$TOPLEVEL" ]
                )