Fall back to HTTP when Apple Git is unavailable - #31496
Merged
Merged
Conversation
fc-oai
marked this pull request as ready for review
July 7, 2026 23:09
Contributor
Author
|
@codex review |
Contributor
|
Codex Review: Didn't find any major issues. Hooray! Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
anp-oai
approved these changes
Jul 8, 2026
fc-oai
enabled auto-merge (squash)
July 8, 2026 18:05
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
/usr/bin/gitshim as unavailable whenxcode-select -preports that developer tools are absentgitcommand lookup on Windows and Linux, including CCARoot cause
Curated plugin startup sync invokes
git ls-remotebefore its HTTP fallback. On a clean Mac,gitresolves to Apple’s/usr/bin/gitshim, and executing the shim opens the Xcode Command Line Tools installer before the process can fail and reach HTTP.On macOS, this change resolves Git through
PATHwithout executing it. If the selected binary is Apple’s shim and developer tools are unavailable, startup sync marks the Git transport unavailable and enters the existing HTTP fallback immediately.The new availability detection is macOS-only by construction. Windows and Linux still execute the literal
gitcommand as before. If Git is missing on Windows, the existing spawn-error path falls back to HTTP; Linux/CCA receives no new lookup or startup behavior.Eager Git audit
I also audited production Git process spawns in
codex-rs..gitentry./diffpaths are explicitly user-invoked.Validation
just fmtjust bazel-lock-update— succeeded with no lockfile deltajust test -p codex-core-plugins— 313 passedjust fix -p codex-core-plugins— completed; emitted one pre-existing unrelatedlarge_enum_variantwarning inmanifest.rsgit diff --check