Skip to content

Skip worktree trust queries for remote collab project clients#46256

Merged
SomeoneToIgnore merged 1 commit intomainfrom
kb/fix-collab-trust
Jan 7, 2026
Merged

Skip worktree trust queries for remote collab project clients#46256
SomeoneToIgnore merged 1 commit intomainfrom
kb/fix-collab-trust

Conversation

@SomeoneToIgnore
Copy link
Contributor

Release Notes:

  • Skip worktree trust queries for remote collab project clients

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 7, 2026
@SomeoneToIgnore SomeoneToIgnore enabled auto-merge (squash) January 7, 2026 14:05
@SomeoneToIgnore
Copy link
Contributor Author

/cherry-pick preview

@SomeoneToIgnore SomeoneToIgnore merged commit cf8200f into main Jan 7, 2026
24 checks passed
@SomeoneToIgnore SomeoneToIgnore deleted the kb/fix-collab-trust branch January 7, 2026 14:06
@SomeoneToIgnore
Copy link
Contributor Author

/cherry-pick preview

@zed-zippy
Copy link
Contributor

zed-zippy bot commented Jan 7, 2026

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

SomeoneToIgnore added a commit that referenced this pull request Jan 7, 2026
Release Notes:

- Skip worktree trust queries for remote collab project clients
SomeoneToIgnore added a commit that referenced this pull request Jan 7, 2026
Release Notes:

- Skip worktree trust queries for remote collab project clients
rtfeldman pushed a commit that referenced this pull request Jan 9, 2026
Release Notes:

- Skip worktree trust queries for remote collab project clients
SomeoneToIgnore added a commit that referenced this pull request Jan 11, 2026
Follow-up of #46256

Release Notes:

- Fixed worktree trust pop-up appearing on a keymap editor invication
github-actions bot pushed a commit that referenced this pull request Jan 11, 2026
Follow-up of #46256

Release Notes:

- Fixed worktree trust pop-up appearing on a keymap editor invication
github-actions bot pushed a commit that referenced this pull request Jan 11, 2026
Follow-up of #46256

Release Notes:

- Fixed worktree trust pop-up appearing on a keymap editor invication
zed-zippy bot added a commit that referenced this pull request Jan 11, 2026
…y-pick to preview) (#46578)

Cherry-pick of #46563 to preview

----
Follow-up of #46256

Release Notes:

- Fixed worktree trust pop-up appearing on a keymap editor invication

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
zed-zippy bot added a commit that referenced this pull request Jan 11, 2026
…y-pick to stable) (#46579)

Cherry-pick of #46563 to stable

----
Follow-up of #46256

Release Notes:

- Fixed worktree trust pop-up appearing on a keymap editor invication

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Veykril added a commit that referenced this pull request Jan 15, 2026
…ee updates (#46882)

It should be a no-op but causes massive main thread hangs on windows due
to the winapi calls this emits, restores the behavior pre
github.com//pull/46256 without reverting the main
changes of that.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
github-actions bot pushed a commit that referenced this pull request Jan 15, 2026
…ee updates (#46882)

It should be a no-op but causes massive main thread hangs on windows due
to the winapi calls this emits, restores the behavior pre
github.com//pull/46256 without reverting the main
changes of that.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
github-actions bot pushed a commit that referenced this pull request Jan 15, 2026
…ee updates (#46882)

It should be a no-op but causes massive main thread hangs on windows due
to the winapi calls this emits, restores the behavior pre
github.com//pull/46256 without reverting the main
changes of that.

Release Notes:

- N/A *or* Added/Fixed/Improved ...
zed-zippy bot added a commit that referenced this pull request Jan 15, 2026
…ee updates (#46882) (cherry-pick to stable) (#46887)

Cherry-pick of #46882 to stable

----
It should be a no-op but causes massive main thread hangs on windows due
to the winapi calls this emits, restores the behavior pre
github.com//pull/46256 without reverting the main
changes of that.

Release Notes:

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

Co-authored-by: Lukas Wirth <lukas@zed.dev>
zed-zippy bot added a commit that referenced this pull request Jan 15, 2026
…ee updates (#46882) (cherry-pick to preview) (#46886)

Cherry-pick of #46882 to preview

----
It should be a no-op but causes massive main thread hangs on windows due
to the winapi calls this emits, restores the behavior pre
github.com//pull/46256 without reverting the main
changes of that.

Release Notes:

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

Co-authored-by: Lukas Wirth <lukas@zed.dev>
LivioGama pushed a commit to LivioGama/zed that referenced this pull request Jan 20, 2026
…dustries#46256)

Release Notes:

- Skip worktree trust queries for remote collab project clients
LivioGama pushed a commit to LivioGama/zed that referenced this pull request Jan 20, 2026
…dustries#46256)

Release Notes:

- Skip worktree trust queries for remote collab project clients
LivioGama pushed a commit to LivioGama/zed that referenced this pull request Feb 15, 2026
…dustries#46256)

Release Notes:

- Skip worktree trust queries for remote collab project clients
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant