Skip to content

worktree: Don't eagerly remove watchers#58692

Merged
probably-neb merged 2 commits into
mainfrom
dont-eagerly-drop-watchers
Jun 5, 2026
Merged

worktree: Don't eagerly remove watchers#58692
probably-neb merged 2 commits into
mainfrom
dont-eagerly-drop-watchers

Conversation

@probably-neb

Copy link
Copy Markdown
Collaborator

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

  • N/A or Added/Fixed/Improved ...

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 5, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Jun 5, 2026
@probably-neb probably-neb force-pushed the dont-eagerly-drop-watchers branch from 8a95c8c to 51444f6 Compare June 5, 2026 21:24
@probably-neb probably-neb force-pushed the dont-eagerly-drop-watchers branch from 51444f6 to 3259c1f Compare June 5, 2026 21:43
@probably-neb probably-neb force-pushed the dont-eagerly-drop-watchers branch from 3259c1f to 8ad13da Compare June 5, 2026 22:08
@probably-neb probably-neb added this pull request to the merge queue Jun 5, 2026
Merged via the queue into main with commit 0c660d0 Jun 5, 2026
32 checks passed
@probably-neb probably-neb deleted the dont-eagerly-drop-watchers branch June 5, 2026 23:51
@probably-neb

Copy link
Copy Markdown
Collaborator Author

/cherry-pick preview
/cherry-pick stable

@zed-zippy

zed-zippy Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

🍒💥 Cherry-pick did not succeed
https://github.com/zed-industries/zed/actions/runs/27047708133

zed-zippy Bot added a commit that referenced this pull request Jun 6, 2026
…iew) (#58709)

Cherry-pick of #58692 to preview

----
Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...

Co-authored-by: Ben Kunkle <ben@zed.dev>
probably-neb added a commit that referenced this pull request Jun 6, 2026
…le) (#58710)

Cherry-pick of #58692 to stable

----
Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 8, 2026
Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants