Make the system installer always append GCM Core entries, not outright set/replace existing values (and fix a typo) #203
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
mjcheetham
added
bug
derrickstolee
approved these changes
Oct 29, 2020
dscho
approved these changes
Oct 29, 2020
|
Maybe |
Rather than set the helper to be _only_ GCM Core in the system
configuration when called with `(un)configure --system`, we do what we
are already doing in the user-case.
We only append an empty ("") reset entry, and then the GCM full path
entry. This means on uninstall of the standalone GCM (be that the system
or user install), we restore the previous entry, always.
mjcheetham
force-pushed
the
fixtypowin
branch
from
68a8155 to
364aeb3
Compare
mjcheetham
changed the title
dscho
approved these changes
Oct 29, 2020
dscho
reviewed
Oct 29, 2020
dscho
reviewed
Oct 29, 2020
| string.IsNullOrWhiteSpace(currentValues[appIndex - 1])) | ||
| { | ||
| // Clear the blank entry | ||
| config.UnsetAll(helperKey, Constants.RegexPatterns.Empty); |
There was a problem hiding this comment.
What if there are multiple empty entries?
There was a problem hiding this comment.
Not entirely sure what we can do here to identify a specific line in a config file, that matches the same value, using only git config commands. Any ideas?
dscho
reviewed
Oct 29, 2020
Add the --get-all and --add Git configuration commands, and use them in place of --get-regexp and --replace-all where applicable.
If we have empty helper entries after GCM, then we should attempt to reconfigure to put GCM back "at the front", since otherwise it's effectively being disabled by those subsequent empty entries.
|
Sorry @dscho, requesting yet another review.. |
dscho
approved these changes
Oct 29, 2020
Only clear the useHttpPath=true option on calls to unconfigure if the "manager-core" option is not present and we're in the system config on a Windows platform. This would be the case for the bundled GCM Core in Git for Windows, which we would break by removing this option.
Since --null means that each config entry terminates with a null
character ('\0') we are left with one extra entry in the array after
splitting the string. This is NOT a real entry and we shouldn't return
it from the method.
mjcheetham
force-pushed
the
fixtypowin
branch
from
7853e56 to
ba81146
Compare
derrickstolee
approved these changes
Oct 30, 2020
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Rather than set the helper to be only GCM Core in the system configuration when called with
(un)configure --system, we do what we are already doing in the user-case.We only append an empty ("") reset entry, and then the GCM full path entry. This means on uninstall of the standalone GCM (be that the system or user install), we restore the previous entry, always.
Catch more existing config cases such as when another 'empty' entry is after GCM. We will now see this case and reconfigure ourselves to be exclusively 'in front'.
Also we are not that meta.. "Git Credential Manager
ManagerCore". Whoops.