Fix config parameter precedence for same-scope values - #41
Merged
mjcheetham merged 1 commit intoSep 21, 2026
Merged
Conversation
sambostock
requested review from
dscho,
mjcheetham and
mpysson
as code owners
October 21, 2025 05:55
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
The implementation matches Git precedence semantics and includes focused regression coverage.
Review effort: Balanced
Findings: 1
Open (1)
What changed in this PR
Corrects same-scope Git configuration precedence so the latest value wins.
Changes:
- Accepts later values with equal priority.
- Adds regression coverage for local and global scopes.
| File | Description |
|---|---|
evt_apply.go |
Updates precedence logic. |
evt_apply_test.go |
Tests same-scope last-value behavior. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
From `git config`'s documentation:
> The files are read in the order given above, with last value found taking precedence over values read earlier.
Currently, we discard values if we already have one with the same
priority. However, this gives us "first one wins" semantics, which is
incorrect.
By instead only discarding values if we already have one with a higher
priority, we can achieve "last one wins" semantics, matching `git`.
This is of particular importance because we use config values to resolve
the nickname and ruleset fields, so the value we resolve must match what
a user would expect when writing their config. For example, consider the
following git config:
[otel.trace2]
ruleset = dl:drop # Drop traces by default)
[includeIf "hasconfig:remote.*.url:https://example.com/my-repo.git"]
path = my-repo-tracing.gitconfig
and in my-repo-tracing.gitconfig
[otel.trace2]
ruleset = dl:verbose # Collect detailed traces for my-repo
Because we have "first one wins" semantics instead of git's "last one
wins" semantics, the override doesn't do anything and traces are
dropped unconditionally.
mjcheetham
force-pushed
the
fix-config-same-scope-precedence
branch
from
September 21, 2026 11:21
bce8995 to
4321b4c
Compare
mjcheetham
approved these changes
Sep 21, 2026
mjcheetham
left a comment
Contributor
There was a problem hiding this comment.
Thank you for finding and fixing this! Sorry for the time it's taken to get around to reviewing this.
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
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.

From
git config's documentation:Currently, we discard values if we already have one with the same priority. However, this gives us "first one wins" semantics, which is incorrect.
By instead only discarding values if we already have one with a higher priority, we can achieve "last one wins" semantics, matching
git.This is of particular importance because we use config values to resolve the nickname and ruleset fields, so the value we resolve must match what a user would expect when writing their config. For example, consider the following git config:
and in my-repo-tracing.gitconfig
Because we have "first one wins" semantics instead of git's "last one wins" semantics, the override doesn't do anything and traces are dropped unconditionally.