Various system gitconfig-related fixes, in particular for MinGit #267
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
The original idea of the now-discontinued support for `C:\ProgramData\Git\config` was to have a central place where Git for Windows writes the settings configured via its installer, so that e.g. MinGit can pick them up. This is particularly important when the user changed the default of e.g. `core.autocrlf` because running `git status` with the Git Bash and with MinGit would otherwise produce inconsistent results. To continue with this idea, MinGit now adds two `include.path` settings that pick up the system gitconfig of the 32-bit and the 64-bit Git for Windows, respectively, if any exist. There is just one problem with that: we include those system gitconfigs _first_, and then configure things like `core.autocrlf`... which overrides Git for Windows' settings. Let's instead include Git for Windows' system gitconfig _after_ setting our defaults. Signed-off-by: Johannes Schindelin <[email protected]>
We patch the cURL shipped in Git for Windows since git-for-windows/MINGW-packages@2e8f4580eb4d to allow it to find the `ca-bundle.crt` file automatically, without the need for `http.sslCAInfo` to be set. So let's no longer initialize that config setting when `git-extra`'s post-install script detects that there is no system gitconfig yet. Signed-off-by: Johannes Schindelin <[email protected]>
The previous commit stopped initializing the system gitconfig with that setting that we no longer need. With this patch, we now actively unset this setting in existing gitconfigs. Note: we are extra careful _not_ to use `git config` to do the editing so that we allow for users who absolutely definitely want to have that setting (they just need to add an extra space or something like that). While at it, we also remove the hack where we installed a symlink `/ssl/` -> `/usr/ssl/` to allow for sharing that setting between the MSYS and the MINGW version of `git.exe`. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
mingit-system-gitconfig-fix
branch
from
b1df236 to
27678c3
Compare
|
@shiftkey could you have a look? |
|
I think this is fine for GitHub Desktop's packaging, as we unset cc @outofambit @niik for visibility |
shiftkey
approved these changes
Nov 8, 2019
dscho
added a commit
that referenced
this pull request
Nov 8, 2019
MinGit [no longer overrides an installed Git for Windows' system gitconfig](#267). Signed-off-by: Johannes Schindelin <[email protected]>
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.
I made a mistake when I added those
include.pathsettings to MinGit's system config which are intended to inherit the installed Git for Windows' defaults: these includes are added to the beginning, which means that MinGit's hard-codedcore.autocrlfand friends always override Git for Windows' defaults. Which defeats the purpose.Let's fix that, and while at it also remove the no longer needed
http.sslCAInfofrom the system gitconfig of Git for Windows' SDK (the installer will still set it, to help Git LFS use Git for Windows' certificate bundle).