Update gix to latest version to include gix status fix to not fail if worktree files can't be read.#11958
Merged
Byron merged 1 commit intogitbutlerapp:masterfrom Jan 22, 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. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the tracing instrumentation for the project_files_change function to skip the repo parameter in trace output. According to the PR description, the originally intended fix for handling files that can't be diffed (particularly on Windows with locked files) actually needs to be implemented in the gitoxide library itself, not in this codebase.
Changes:
- Added
repoto the skip list in the#[instrument]macro forproject_files_changefunction
Byron
changed the title
gix to latest version to include gix status fix to not fail if worktree files can't be read.
Collaborator
Author
|
@krlvi The codeowners trigger is because I had to update |
…itbutlerapp#5407) Right now, when a file that shows up in the status check can't be diffed, the whole operation fails. It turns out that on Windows, there are files that are locked and can't be read, so we should avoid failing in this case. Unfortunately the exact error code is unknown, but maybe we can make it a general feature and log the ignored files for now. Actually, this is an issue here: https://github.com/GitoxideLabs/gitoxide/blob/5c1bd0387f98eee37265a42ba4b6624c783c9a71/gix-status/src/index_as_worktree_with_renames/mod.rs#L530 So the status fails, and a `gix` fix is needed for 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.
Right now, when a file that shows up in the status check can't be diffed, the whole operation fails.
It turns out that on Windows, there are files that are locked and can't be read, so we should avoid failing in this case.
Unfortunately the exact error code is unknown, but maybe we can make it a general feature and log the ignored files for now.
Related to #5407
Edit:
Actually this needs https://github.com/GitoxideLabs/gitoxide/blob/5c1bd0387f98eee37265a42ba4b6624c783c9a71/gix-status/src/index_as_worktree_with_renames/mod.rs#L530 to be altered to be able to survive not being able to read the file. So nothing to be done here.
This is now fixed, probably, with a fix in
gix. If it still fails, I think Windows might come up with different error codes, as for now I constrain it to specific issues.Tasks
gix