[codex] Report structured Git status refusals#30863
Open
bookholt-oai wants to merge 18 commits into
Open
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 52b2106666
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
…ec-4396-git-07-status-guard # Conflicts: # codex-rs/git-utils/src/errors.rs # codex-rs/git-utils/src/git_command.rs # codex-rs/git-utils/src/safe_git.rs # codex-rs/git-utils/src/safe_git_tests.rs
…ec-4396-git-07-status-guard
…6-git-07-status-guard
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.
Why
Workspace change detection currently reduces Git failures to an unavailable boolean. It can also let
git statusselect a repository-configured executable filter before the caller knows whether the read is safe.Callers need a safe status result or a useful explanation of why one was unavailable.
Approach
Add
try_get_has_changes, which returns either the change result or a structuredGitReadError. Keep the existingget_has_changeswrapper for callers that still want best-effort behavior.Run preparation and the final status read through one trusted, repository-authorized Git runner. Preserve the caller's original path while discovering repository authority so a symlink cannot hide an enclosing repository. Reuse the stack's configuration and filter checks, and skip the expensive path scan when no filter driver exists.
The final command is fixed to
git status --porcelain --ignore-submodules=dirty, with hooks disabled and executable filters neutralized. One deadline covers the whole operation, output is bounded, and cancellation stops the active child.Turn metadata reports
has_changes_unavailable_reasonwhen the safe read cannot be completed, instead of silently reporting a clean workspace.This PR is stacked on #30854 and should land after it.
Testing
codex-git-utilstests passed.