Upgrade gix for better commit message trailer parsing support/better diff slider processing#13298
Merged
Byron merged 1 commit intogitbutlerapp:masterfrom Apr 14, 2026
Merged
Conversation
|
@Byron is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
gix for better trailer parsing supportgix for better commit message trailer parsing support/better diff slider processing
7 tasks
Caleb-T-Owens
approved these changes
Apr 14, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the gix (gitoxide) git dependency to a newer upstream revision to pick up fixes/improvements for commit message trailer parsing and diff processing.
Changes:
- Bump the pinned
gixandgix-testtoolsgit revision in the workspaceCargo.toml. - Regenerate
Cargo.lockto reflect the updated git source for thegix*crate set. - Adjust commit trailer extraction to use the updated
gixtrailer value ownership API (into_owned()).
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| crates/gitbutler-repo/src/commit_message.rs | Adapts trailer value extraction to the updated gix API while preserving the existing commit message parsing behavior. |
| Cargo.toml | Updates the pinned git revision for gix and gix-testtools in tandem. |
| Cargo.lock | Updates locked git sources for gix and related crates to the new revision. |
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.
Relevant for #13247, #13048, #12948.
wait for Use imara-diff-v2 by default GitoxideLabs/gitoxide#2513- do not wait for it, as it might cause use to require more changes, possibly, also the conflict-handling doesn't have to block on it.