fix(git): correctly merge existing GIT_CONFIG_ variables if set
#40581
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
12 tasks
As noted in #40580, we have cases where the `GIT_CONFIG` environment variables may be set by a user, and Renovate doesn't correctly merge them into the resulting variables, although it does use the existing `GIT_CONFIG_COUNT` as its starting point for new variables. To correctly handle this, we should make sure that if there are existing variables set, we copy them over. If the `GIT_CONFIG_COUNT` is set, but some value(s) are missing, we should make sure to log a warning and default them to the empty string. It's likely this may break Git, but be a more reasonable error than the current behaviour.
jamietanna
force-pushed
the
defect/git-config
branch
from
2b9440a to
893aaf0
Compare
jamietanna
commented
Jan 21, 2026
Comment on lines
+83
to
+86
| logger.once.warn( | ||
| `GIT_CONFIG_COUNT=${gitConfigCount}, but there was no value for ${envKey}. Setting it to the empty string, which may break git`, | ||
| ); | ||
| newEnvironmentVariables[envKey] = ''; |
Contributor
Author
There was a problem hiding this comment.
I'd probably say that this could be an error, and/or stop processing Renovate (we could check it earlier in the Renovate process) - I think it isn't the best to try and "massage" environment here, if it's incorrectly set
Member
There was a problem hiding this comment.
this should be done somewhere at line 42, where we parse the existing count.
your fix can still error if both env have the count set.
Contributor
|
It's still in a draft mode. What is needed to make it "non-draft"? It would be good to release it before Renovate 43. |
Contributor
Author
|
Sorry, won't make it in before 43! |
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.
Changes
As noted in #40580, we have cases where the
GIT_CONFIGenvironmentvariables may be set by a user, and Renovate doesn't correctly merge
them into the resulting variables, although it does use the existing
GIT_CONFIG_COUNTas its starting point for new variables.To correctly handle this, we should make sure that if there are existing
variables set, we copy them over.
If the
GIT_CONFIG_COUNTis set, but some value(s) are missing, weshould make sure to log a warning and default them to the empty string.
It's likely this may break Git, but be a more reasonable error than the
current behaviour.
Context
Please select one of the below:
GIT_CONFIG_KEY_handling doesn't merge existing environment variables in #40580AI assistance disclosure
Did you use AI tools to create any part of this pull request?
Please select one option and, if yes, briefly describe how AI was used (e.g., code, tests, docs) and which tool(s) you used.
Documentation (please check one with an [x])
How I've tested my work (please select one)
I have verified these changes via:
The public repository: https://github.com/JamieTanna-Mend-testing/issue-40575