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

Support new GIT_CONFIG_PARAMETERS format #573

Merged
merged 4 commits into from
Apr 24, 2021

Conversation

dandavison
Copy link
Owner

@dandavison dandavison commented Apr 24, 2021

git -c delta.option=val ... is currently broken for git ≥2.31.0 due to some recent changes in the format used by git for the GIT_CONFIG_PARAMETERS env var. See https://github.com/git/git/blob/311531c9de557d25ac087c1637818bd2aad6eb3a/Documentation/RelNotes/2.31.0.txt#L127-L130. This PR makes delta work with git < 2.31.0 and ≥2.31.0.

@dandavison dandavison changed the title Support new style git config parameters Support new GIT_CONFIG_PARAMETERS format Apr 24, 2021
@dandavison dandavison merged commit eef33b6 into master Apr 24, 2021
@dandavison dandavison deleted the support-new-style-git-config-parameters branch April 24, 2021 15:26
@epage
Copy link

epage commented Aug 5, 2021

Thanks for laying the grounwork on this! I've gone ahead and generalized this in git-config-env, based on the logic from git's source.

@dandavison
Copy link
Owner Author

@epage ah I'm glad you came across this and thanks very much for doing that. As you see, I didn't attempt to do this very robustly here, e.g. did not tackle embedded quotes.

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.

None yet

2 participants