1.3.16-pre: 1.3.15 Fixes #2339
Merged
1.3.16-pre: 1.3.15 Fixes #2339
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daxgames
changed the title
Jackenmen
reviewed
Jun 29, 2020
vendor/init.bat
Outdated
Comment on lines
204
to
211
| if not defined 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 | ||
|
|
||
| if defined GIT_INSTALL_ROOT ( | ||
| goto :FOUND_GIT | ||
| goto :FOUND_GIT | ||
| ) |
There was a problem hiding this comment.
This makes the script always go to FOUND_GIT which does not seem intended, e.g. %lib_git% compare_git_versions does not define GIT_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:
Suggested change
| if not defined 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 | |
| if defined 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 | |
| if defined GIT_INSTALL_ROOT ( | |
| goto :FOUND_GIT | |
| ) |
|
@jack1142 you are correct. Fixed |
Jackenmen
approved these changes
Jul 1, 2020
|
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
selimb
suggested changes
Jul 23, 2020
vendor/init.bat
Outdated
| :: See vendor\git-for-windows\README.portable for why we do this | ||
| :: A |
3 tasks
…mes/cmder into fix_global_vars_vscode_err
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.