better git path handling #865
Merged
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
This was referenced Mar 2, 2016
| @@ -41,6 +41,8 @@ try { | |||
| # Check if git is on PATH, i.e. Git already installed on system | |||
| Get-command -Name "git" -ErrorAction Stop >$null | |||
| } catch { | |||
| $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\cmd") | |||
| # for bash.exe, which in the cmd version is found as <GIT>\usr\bin\bash.exe | |||
| $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\bin") | |||
There was a problem hiding this comment.
I'm actually not sure if this is a nice thing to keep the ...\bin version: the problem is that if the user has added git to the path (via the git for windows installer), then bash is not found as the installer does not add bin to the path.
IMO both version should result in the same apps visible in path... Not sure how to ensure that, probably by setting GIT_INSTALL_PATH and then unconditionally adding the bin path?
|
I did add it to mine. |
|
Updated and repushed |
|
Could you resync, your branch again? Thanks. |
The idea is: * if the users points as to a specific git, use that * test if a git is in path and if yes, use that * last, use our vendored git We don't make any attempt to guess a different location, if a user wants their own git install, they have to choose "add git to path". Also check that we have a recent enough version of git (e.g. test for <GIT>\cmd\git.exe)
Some unix commands shadow windows commands and therefor the unix commands should be at the end of the PATH
The only reason was bash but bash.exe is also in <GIT>\usr\bin.
This ensures that the "normal" path entry (cmd) is first and bash is still reachable via the bin path.
|
Updated, sorry for the long delay, seems I missed the rebase request. |
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.
This PR contains
threetwo main commits