Merge pull request #2464 from stephensolis/patch-1

daxgames · web-flow · commit a7e45ef64aa3 · 2021-01-17T08:30:32.000-05:00
Fix: "The system cannot find the file specified" if %GIT_INSTALL_ROOT%\usr\bin doesn't exist
diff --git a/vendor/init.bat b/vendor/init.bat
@@ -251,9 +251,9 @@ if %nix_tools% geq 1 (
         %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw32\bin" %path_position%
     ) else if exist "%GIT_INSTALL_ROOT%\mingw64" (
         %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw64\bin" %path_position%
+    ) else if exist "%GIT_INSTALL_ROOT%\usr\bin" (
+        %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%
     )
-
-    %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%
 )
 
 :: define SVN_SSH so we can use git svn with ssh svn repositories

Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,9 @@ if %nix_tools% geq 1 (`
`251`	`251`	`%lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw32\bin" %path_position%`
`252`	`252`	`) else if exist "%GIT_INSTALL_ROOT%\mingw64" (`
`253`	`253`	`%lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw64\bin" %path_position%`
	`254`	`+ ) else if exist "%GIT_INSTALL_ROOT%\usr\bin" (`
	`255`	`+ %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%`
`254`	`256`	`)`
`255`		`-`
`256`		`- %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%`
`257`	`257`	`)`
`258`	`258`
`259`	`259`	`:: define SVN_SSH so we can use git svn with ssh svn repositories`