Repository navigation
fix(server): git 2.56 broken-gitfile worktrees count as non-repositories again - #56
Merged
Merged
Conversation
…ies again Port of upstream pingdotgg#33423. Git 2.56 reports a `.git` gitfile that points at a missing directory as "gitfile does not point to a valid repository" instead of "not a git repository", so storage cleanup marked those worktrees failed instead of keeping them. The three non-repository checks now share one classifier that matches both wordings.
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
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.
test server 1 has been red on every fork main push.
storageCleanup.test.ts› "compares the checked-out branch without a full status" points a worktree's.gitat/missing-git-directoryand expects cleanup to keep it as "Repository or branch changed". git 2.56, which the hosted ubuntu runners have now, rewords that error fromnot a git repositorytogitfile does not point to a valid repository, so cleanup reported the worktree asfailedwith the raw git line instead. so its real behavior, not a flaky test. anyone on git 2.56 with a worktree whose gitdir is gone gets a failed cleanup entry instead of a kept onethis is a straight port of the upstream fix, which applied cleanly. julius closed the earlier attempt in favor of it, but it isnt merged upstream yet:
isNonRepositoryGitStderrinGitVcsDriverCore.tsnow matches both wordings and is exported, andstorageCleanup.tsandGitManager.tscall it instead of keeping their own inline copies. tradeoff is we're still string matching git's stderr, so a future reword breaks it again, but both cases exit 128 so there's nothing better to key on. other gitfile errors likeinvalid gitfile formatstill count as failures, and a test row covers thatchecked against a real git 2.56.0 (homebrew bottle unpacked into a temp dir): the test fails on main with the exact CI error and passes with this change, and it still passes on git 2.53
written by Claude Opus 5.5 in Claude Code