forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
cmake: set correct path to gitconfig on Windows #3078
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
Merged
dscho
merged 1 commit into
git-for-windows:main
from
dennisameling:gitconfig-cmake-windows
Mar 5, 2021
Merged
cmake: set correct path to gitconfig on Windows #3078
dscho
merged 1 commit into
git-for-windows:main
from
dennisameling:gitconfig-cmake-windows
Mar 5, 2021
Conversation
This file contains hidden or 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
1 task
That looks pretty good. Only the commit message seems to be eager to be improved ;-)
How about this instead?
|
e6640ed
to
57f16f4
Compare
Sounds good to me! Just updated the commit message 😊 |
Currently, when Git for Windows is built with CMake, the system Git config is expected in a different location than when building via `make`: the former expects it to be in `<runtime-prefix>/mingw64/etc/gitconfig`, the latter in `<runtime-prefix>/etc/gitconfig`. Because of this, things like `git clone` do not work correctly (because cURL is no longer able to find its certificate bundle that it needs to validate HTTPS certificates). See the full bug report and discussion here: git-for-windows#3071 (comment). This commit aligns the CMake-based build by mimicking what is already done in `config.mak.uname`. This closes git-for-windows#3071. Signed-off-by: Dennis Ameling <[email protected]>
57f16f4
to
5fcfa13
Compare
dscho
added a commit
that referenced
this pull request
Mar 6, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 6, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 6, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 6, 2021
cmake: set correct path to gitconfig on Windows
git-for-windows-ci
pushed a commit
that referenced
this pull request
Mar 8, 2021
cmake: set correct path to gitconfig on Windows
git-for-windows-ci
pushed a commit
that referenced
this pull request
Mar 8, 2021
cmake: set correct path to gitconfig on Windows
git-for-windows-ci
pushed a commit
that referenced
this pull request
Mar 8, 2021
cmake: set correct path to gitconfig on Windows
git-for-windows-ci
pushed a commit
that referenced
this pull request
Mar 8, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 8, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 10, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 10, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 10, 2021
cmake: set correct path to gitconfig on Windows
dscho
added a commit
that referenced
this pull request
Mar 10, 2021
cmake: set correct path to gitconfig on Windows
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.
Closes #3071
Currently, when Git for Windows is built with CMake, the
gitconfig
system-level file can't be read by Git. Because of this, things likegit clone
don't work correctly. More details in #3071 (comment). This PR fixes that behavior by mimicking what was already done inconfig.mak.uname
, but then slightly changed to work correctly with CMake.Note: this applies to all CMake builds where Windows is targeted (WIN32).
Before applying this PR:
After applying this PR: