Wire up worktree archival on thread archive and restoration on unarchive - #53215

Merged

rtfeldman merged 43 commits into

mainfrom

persist-worktree-3-wiring

Apr 8, 2026

Commits on Apr 6, 2026

Add allow_empty commits, detached worktree creation, and new git operations
rtfeldman
committed
25ff899
Remove redundent --no-optional-locks argument in new git commands
Anthony-Eid
committed
ace8b89
Fix merge conflicts
Anthony-Eid
committed
a9c0a71
Unify the create worktree functions
Anthony-Eid
committed
a357250
Add remote support for repository::head_sha
Anthony-Eid
committed
f9a0239
Support HEAD^ in fake repo reset implementation
Anthony-Eid
committed
b8d8b73
Don't update HEAD ref in fake repo when creating detached worktree
Anthony-Eid
committed
301e5e3
Remove stage_all_including_untracked method
Anthony-Eid
committed
bd78423
Add resolve_commit and repair_worktrees to git layer
rtfeldman
committed
3061d32
Fix merge conflicts
Anthony-Eid
committed
13b51f6
Add resolve_commit and repair_worktrees to git layer
rtfeldman
committed
8edcdbd
Fix proto migration
Anthony-Eid
committed
4852966
Merge branch 'persist-worktree-1-git-api' of github.com:zed-industries/zed into persist-worktree-1-git-api
Anthony-Eid
committed
cb06094
dedup repair_worktrees calls
Anthony-Eid
committed
1ae05cd
Add ArchivedGitWorktree data model and DB operations
rtfeldman
committed
8774038
Add original_commit_hash to ArchivedGitWorktree
rtfeldman
committed
e2f2e38
Merge remote-tracking branch 'origin' into persist-worktree-2-archived-model
Anthony-Eid
committed
353d0cf
Remove resolve_commit, we renamed this to commit_exists but merge conflict added in both
Anthony-Eid
committed
1e1c1c5

Commits on Apr 7, 2026

Commits on Apr 8, 2026

Merge remote-tracking branch 'origin/main' into persist-worktree-3-wiring
rtfeldman
committed
0e76d14
Fix worktree archive correctness, cleanup, and error handling
rtfeldman
committed
f6405f2
Remove plan.md
rtfeldman
committed
b835d1f
Replace smol channels with futures equivalents
rtfeldman
committed
e1c73e7
Remove decorative comment separators
rtfeldman
committed
7990996
Address code review: remove dead code, fix cancellation checks, add explicit drops
rtfeldman
committed
5ba377d
Add doc comments and explicit drops to thread_worktree_archive
rtfeldman
committed
64d65ef
Add test reproducing New Thread on archived worktree bug
rtfeldman
committed
bce11fe
Fix archive of last linked worktree thread creating spurious New Thread
rtfeldman
committed
d5ffd8e
Merge origin/main, resolve conflicts in archive_thread
rtfeldman
committed
4a2faca
Fix CI: remove redundant clone and unused futures dependency
rtfeldman
committed
aaa0d5b
Restore worktree deletion when archiving the last thread
rtfeldman
committed
e01d545
Revert channels from futures back to smol
rtfeldman
committed
3733e35
Rename in_flight
rtfeldman
committed
076a224
Reorder a field
rtfeldman
committed
9944f3e
Rename complete_worktree_restore to update_restored_worktree_paths
rtfeldman
committed
dfb5614
Delete planning file
rtfeldman
committed
6f560c9
Replace flaky polling loop with deterministic run_until_parked calls
rtfeldman
committed
a5eb91a
Merge remote-tracking branch 'origin/main' into persist-worktree-3-wiring
rtfeldman
committed
341d62b
Add doc comments to RootPlan, AffectedProject, and build_root_plan
rtfeldman
committed
052cc38