Add cancel button and spinner for pending worktree restores - #53241

Closed

rtfeldman wants to merge 26 commits into

mainfrom

persist-worktree-4-cancel-restore

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
Wire up worktree archival on thread archive and restoration on unarchive
rtfeldman
committed
40cadcb
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
e9783e6
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
210657c
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
76fa06b
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
4759add
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
2b463da
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
93f382f
Wire up original_commit_hash in archive and restore flows
rtfeldman
committed
aa031fb
Add cancel button and spinner for pending worktree restores
rtfeldman
committed
99ea3b4
Add cancel button and restore spinner for worktree restores
rtfeldman
committed
fa56504

Navigation Menu

Uh oh!

Add cancel button and spinner for pending worktree restores - #53241

Add cancel button and spinner for pending worktree restores#53241
rtfeldman wants to merge 26 commits into
mainfrom
persist-worktree-4-cancel-restore

Commits on Apr 6, 2026

Add allow_empty commits, detached worktree creation, and new git operations

Remove redundent --no-optional-locks argument in new git commands

Fix merge conflicts

Unify the create worktree functions

Add remote support for repository::head_sha

Support HEAD^ in fake repo reset implementation

Don't update HEAD ref in fake repo when creating detached worktree

Remove stage_all_including_untracked method

Add resolve_commit and repair_worktrees to git layer

Fix merge conflicts

Add resolve_commit and repair_worktrees to git layer

Fix proto migration

Merge branch 'persist-worktree-1-git-api' of github.com:zed-industries/zed into persist-worktree-1-git-api

dedup repair_worktrees calls

Add ArchivedGitWorktree data model and DB operations

Add original_commit_hash to ArchivedGitWorktree

Wire up worktree archival on thread archive and restoration on unarchive

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Wire up original_commit_hash in archive and restore flows

Add cancel button and spinner for pending worktree restores

Add cancel button and restore spinner for worktree restores