GH-3736: Use the system Git in electron. #3747
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
kittaakos
force-pushed
the
GH-3736
branch
3 times, most recently
from
7c32b73 to
b8ce225
Compare
|
The Windows build fails with Although I do not have the failing |
|
@svenefftinge, @AlexTugarev can one of you look into this? Thanks! |
AlexTugarev
reviewed
Dec 11, 2018
| // tslint:disable-next-line:no-any | ||
| protected async handleExternalNotFound(err?: any): Promise<void> { | ||
| if (err) { | ||
| this.logger.error(err); |
There was a problem hiding this comment.
Should we notify users in such cases?
There was a problem hiding this comment.
👍 Oh sure. I did not want to log the stack trace; the user cannot do much with that, but I wanted to "log" Could not find Git on the PATH. Falling back to the embedded Git. via the messageService.
If Git does not exisit on the `PATH`, fall back to the embedded Git. Closes #3736. Signed-off-by: Akos Kitta <kittaakos@typefox.io>
|
@AlexTugarev, please retake a look. This time, the PR is without the message service notifications. We can handle it in a follow-up if needed. |
AlexTugarev
reviewed
Dec 18, 2018
| if (!!execPath && !!path && !!version) { | ||
| // https://github.com/desktop/dugite/issues/111#issuecomment-323222834 | ||
| // Instead of the executable path, we need the root directory of Git. | ||
| const dir = dirname(dirname(path)); |
There was a problem hiding this comment.
if path is e.g. /usr/local/bin/git, dir is supposed to be /usr/local?
There was a problem hiding this comment.
☝️ Yes, there is the comment above the code.
|
Works fine! Just verified, that the git from Then, after managing to "disable" Apple's default git, I could test the fallback to embedded git as well. Also, put a breakpoint into dugite code, just to make sure it shows the proper git location. |
|
Wow, thanks for the review @AlexTugarev! The Windows build is the good old I am going to merge this. |
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.
If Git does not exist on the
PATH,fall back to the embedded Git.
Closes #3736.
Closes #3571.