Skip to content

Fix worktree trust not applied on window reuse#46623

Merged
SomeoneToIgnore merged 1 commit intomainfrom
kb/trust-issues
Jan 12, 2026
Merged

Fix worktree trust not applied on window reuse#46623
SomeoneToIgnore merged 1 commit intomainfrom
kb/trust-issues

Conversation

@SomeoneToIgnore
Copy link
Contributor

New workspace/window creates a different WeakEntity<WorktreeStore> for the same path, which was not considered before.

Closes #46318

Release Notes:

  • Fixed worktree trust not applied in window reuse

New workspace/window creates a different `WeakEntity<WorktreeStore>` for the same path, which was not considered before.
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 12, 2026
@SomeoneToIgnore SomeoneToIgnore enabled auto-merge (squash) January 12, 2026 14:30
@SomeoneToIgnore SomeoneToIgnore merged commit bf3cab6 into main Jan 12, 2026
38 of 40 checks passed
@SomeoneToIgnore SomeoneToIgnore deleted the kb/trust-issues branch January 12, 2026 15:05
@SomeoneToIgnore
Copy link
Contributor Author

/cherry-pick preview
/cherry-pick stable

github-actions bot pushed a commit that referenced this pull request Jan 12, 2026
New workspace/window creates a different `WeakEntity<WorktreeStore>` for
the same path, which was not considered before.

Closes #46318

Release Notes:

- Fixed worktree trust not applied in window reuse
github-actions bot pushed a commit that referenced this pull request Jan 12, 2026
New workspace/window creates a different `WeakEntity<WorktreeStore>` for
the same path, which was not considered before.

Closes #46318

Release Notes:

- Fixed worktree trust not applied in window reuse
zed-zippy bot added a commit that referenced this pull request Jan 12, 2026
…to preview) (#46628)

Cherry-pick of #46623 to preview

----
New workspace/window creates a different `WeakEntity<WorktreeStore>` for
the same path, which was not considered before.

Closes #46318

Release Notes:

- Fixed worktree trust not applied in window reuse

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
SomeoneToIgnore added a commit that referenced this pull request Jan 12, 2026
…to stable) (#46629)

Cherry-pick of #46623 to stable

----
New workspace/window creates a different `WeakEntity<WorktreeStore>` for
the same path, which was not considered before.

Closes #46318

Release Notes:

- Fixed worktree trust not applied in window reuse

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
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.

New workspace trust isn't applied when switching projects until a restart

1 participant