Fix crash when git branch config has a duplicate key#4
Closed
dennisdoomen wants to merge 1 commit into
Closed
Conversation
GetRemoteNameAndBranch built a Dictionary from the raw key/value lines of a [branch "..."] config section with ToDictionary, which throws ArgumentException on a duplicate key. VS Code's Git extension is known to append a duplicate vscode-merge-base entry instead of updating it in place, which crashed FromLocalDirectory (and therefore GitVersionAttribute) for anyone using it. Group by key and take the last value instead (matches git's own last-value-wins semantics), and skip malformed lines without an '=' instead of throwing an IndexOutOfRange. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Owner
Author
|
Reopening against Fallout-build/Fallout instead. |
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
1 participant
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.
Fixes a crash in
GitRepository.GetRemoteNameAndBranchwhen the git branch config section contains a duplicate key.Problem
VS Code's Git extension appends a
vscode-merge-baseentry to[branch "..."]instead of updating it in place, sometimes leaving it duplicated. Parsing that section built aDictionarywithToDictionary, which throws:This breaks
GitRepository.FromLocalDirectory, and therefore[GitVersion]parameter injection, for any consumer whose.git/confighas this duplicate.Fix
Group config lines by key and take the last value (matches git's own last-value-wins semantics) instead of
ToDictionary. Also skip lines without=instead of crashing withIndexOutOfRangeException.Testing
Added a regression test that reproduces the exact reported exception against a real temp git repo with a duplicated
vscode-merge-baseline, and confirmed it fails without the fix and passes with it. Ran the fullFallout.Build.Testssuite (only the pre-existing, unrelatedFromDirectoryTestworktree limitation fails, confirmed to fail identically onmain).