config: read repositoryformatversion in unmarshalCore - #2167
Merged
pjbgf merged 1 commit intoJul 31, 2026
Merged
Conversation
marshalCore writes core.repositoryformatversion when it isn't empty, but unmarshalCore never set Core.RepositoryFormatVersion from the parsed section. On a repo with explicit repositoryformatversion=1 the field loaded as the zero value, so verifyExtensions treated the repo as version 0 and rejected V1 extensions like worktreeConfig that the on-disk config clearly enabled. Mirror the V6 fix (commit 6923824) so Version_1 round-trips correctly. Closes go-git#2155 Signed-off-by: Charlie Tonneslan <cst0520@gmail.com>
pjbgf
approved these changes
Jul 31, 2026
pjbgf
left a comment
pjbgf
left a comment
Member
There was a problem hiding this comment.
@c-tonneslan thanks for working on 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
2 participants
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.
`marshalCore` writes `core.repositoryformatversion` when it isn't empty, but `unmarshalCore` never set `Core.RepositoryFormatVersion` from the parsed section. So on a repo with explicit `repositoryformatversion=1` the field loaded as the zero value and `verifyExtensions` treated the repo as version 0, which then rejected V1 extensions like `worktreeConfig` that the on-disk config clearly enabled.
Mirror of the V6 fix on `main` (the read is already there in commit 6923824). Test fails on `releases/v5.x` without the change.
fixes #2155