Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix addGitBashToEnv and addGitToEnv on Windows #30

Merged
merged 2 commits into from
Jun 22, 2022
Merged

Conversation

aminya
Copy link
Member

@aminya aminya commented Aug 9, 2021

Functional changes:

  • Include the mingw directory in the PATH
    (this directory contains many of the actual git functions,
    such as git-pull, git-push, and git-upload-pack).

  • Search env.ProgramW6432 for Git before env.ProgramFiles,
    as ProgramFiles is not guaranteed to always point to
    the x64 Program Files directory.

Technically, we should get the mingw path from git --exec-path
(and this is what the GitHub package does), but that would mean
making git.addGitToEnv(env) async,
which would have been a much larger PR.

From atom/apm#839

Co-Authored-By: Winston Liu @50Wliu

@aminya aminya force-pushed the windows-tests branch 3 times, most recently from 83060cc to 5475c82 Compare August 9, 2021 02:56
Functional changes:

- Include the mingw directory in the PATH
(this directory contains many of the actual git functions,
such as `git-pull`, `git-push`, and `git-upload-pack`).

- Search `env.ProgramW6432` for Git before `env.ProgramFiles`,
as `ProgramFiles` is not guaranteed to always point to
the x64 Program Files directory.

Technically, we should get the mingw path from `git --exec-path`
(and this is what the GitHub package does), but that would mean
making `git.addGitToEnv(env)` async,
which would have been a much larger PR.

From atom/apm#839

Co-Authored-By: Winston Liu <2766036+50Wliu@users.noreply.github.com>
@aminya aminya marked this pull request as ready for review June 22, 2022 02:57
@aminya aminya merged commit 0260bc4 into master Jun 22, 2022
@aminya aminya deleted the windows-tests branch June 22, 2022 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant