- Notifications
You must be signed in to change notification settings - Fork2.1k
1.3.16-pre: 1.3.15 Fixes#2339
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
Jackenmen left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Sooo, thevendor/init.bat in thecmder_mini.zip artifact is not using the version from this PR for some reason 🤔
I updated it manually however, and the error is gone.
I do have one review comment though.
vendor/init.bat Outdated
| ifnotdefined GIT_INSTALL_ROOT ( | ||
| :: get the absolute path to the user provided git binary | ||
| %lib_git%is_git_shim"%%~dpF" | ||
| %lib_git%get_user_git_version | ||
| %lib_git% compare_git_versions | ||
| ifdefined GIT_INSTALL_ROOT ( | ||
| goto :FOUND_GIT | ||
| goto :FOUND_GIT | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
This makes the script always go toFOUND_GIT which does not seem intended, e.g.%lib_git% compare_git_versions does not defineGIT_INSTALL_ROOT when the checked git is older than the vendored git.
So this should probably be checked at the end of each iteration instead:
| ifnotdefined GIT_INSTALL_ROOT ( | |
| :: get the absolute path to the user provided git binary | |
| %lib_git% is_git_shim"%%~dpF" | |
| %lib_git% get_user_git_version | |
| %lib_git% compare_git_versions | |
| ifdefined GIT_INSTALL_ROOT ( | |
| goto :FOUND_GIT | |
| goto :FOUND_GIT | |
| ) | |
| :: get the absolute path to the user provided git binary | |
| %lib_git% is_git_shim"%%~dpF" | |
| %lib_git% get_user_git_version | |
| %lib_git% compare_git_versions | |
| ifdefined GIT_INSTALL_ROOT ( | |
| goto :FOUND_GIT | |
| ) |
@jack1142 you are correct. Fixed |
Jackenmen left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Works for me and code looks fine (with the low knowledge of batch I have at least) 👍
I don't think theif not defined GIT_INSTALL_ROOT is needed but it's not gonna break anything so it's just nitpicking :P
I need to look at one other thing and when I do I will merge this in. |
… from inside or outside cmder
… from inside or outside cmder
vendor/init.bat Outdated
| if"%CMDER_CONFIGURED%"gtr1goto CMDER_CONFIGURED | ||
| :: See vendor\git-for-windows\README.portable for why we do this | ||
| :: A |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
?
Uh oh!
There was an error while loading.Please reload this page.
Fixes
GIT_INSTALL_ROOTgets set incorrectly togit_root\mingw64\binpath #2340GIT_INSTALL_ROOTgets set incorrectly togit_root\mingw64\binpathfast_initchecked for too soon, which results in a bunch of debug errors in certain fringe conditions.\Adds
%cmder_root%\vendor\bin\vscode_init.batsmarter so it can configure Cmder integrated terminal whether it is launched inside or outside cmder.