fix(crafter): handle invalid merge branch config during repo open#3032
Merged
migmartri merged 1 commit intochainloop-dev:mainfrom Apr 14, 2026
Merged
Conversation
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
1 issue found across 2 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="pkg/attestation/crafter/crafter.go">
<violation number="1" location="pkg/attestation/crafter/crafter.go:340">
P2: When `repo.Remotes()` hits `branch config: invalid merge`, this now returns `nil` head commit instead of preserving the already-resolved commit metadata.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review, or fix all with cubic.
migmartri
force-pushed
the
fix/crafter-invalid-merge-branch
branch
from
3f63151 to
a734897
Compare
jiparis
approved these changes
Apr 14, 2026
migmartri
force-pushed
the
fix/crafter-invalid-merge-branch
branch
from
a734897 to
ce07ac1
Compare
Gracefully handle "branch config: invalid merge" errors from go-git when opening a repository, similar to the existing protection for remote listing. This prevents the crafter from crashing when the local git config has an invalid merge reference. Also upgrades go-git to v5.17.2. Closes chainloop-dev#3031 Signed-off-by: Miguel Martinez Trivino <miguel@chainloop.dev>
migmartri
force-pushed
the
fix/crafter-invalid-merge-branch
branch
from
ce07ac1 to
52133f5
Compare
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.
Summary
branch config: invalid mergeerrors from go-git when opening a repository, not just when listing remotes. This is a protective measure to prevent the crafter from crashing on repos with invalid merge references in their git config, similar to the existing protection we already had for the remote-listing pathisBranchInvalidMergeErrorhelper to deduplicate the string-based error checkCloses #3031