config: check both git/etc and git/mingw64/etc on windows
#1194
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
pmrowla
commented
Jul 14, 2023
| git_dir, _bin_dir = os.path.split(path) | ||
| yield git_dir | ||
| parent_dir, basename = os.path.split(git_dir) | ||
| if basename == "mingw32" or basename == "mingw64": | ||
| yield parent_dir |
There was a problem hiding this comment.
Both Git/etc/... and Git/mingw64/etc/... exist in the windows Git installations I tried, but in all the cases I saw git was only using Git/etc/gitconfig (regardless of shell). But I'm not entirely sure that we can expect consistent behavior across all windows Git versions, so I went with the safe option of just yielding both Git/ and Git/mingw64/ whenever we are in the mingw/git-bash environment.
|
@jelmer Could you trigger a release, please? 🙏 |
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.
Current windows Git installations include separate git exe's in
Git/cmd/git.exeandGit/mingw64/bin/git.exe. The mingw64 build will be in the PATH when the user is in git-bash, and the nativecmd/git.exebuild will be in the PATH in native windows shells (cmd.exe or powershell).The system level gitconfig that gets used by either
git.exeis located inGit/etc/gitconfig, but the existing windows gitconfig lookup behavior only searchesGit/mingw64/etc/gitconfig