git: Fix add safe directory button doing nothing#58705
Merged
Merged
Conversation
Member
Author
|
/cherry-pick preview |
This was referenced Jun 6, 2026
Collaborator
|
@zed-zippy approve |
zed-zippy Bot
added a commit
that referenced
this pull request
Jun 6, 2026
…k to preview) (#58715) Cherry-pick of #58705 to preview ---- We had a nested spawn that was disguising the fact that the actual `git_config` task was being dropped immediately instead of detached. This only seems to cause problems in release builds due to timing issues. 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 Release Notes: - Fixed a bug where clicking the button to trust a git repository would do nothing. Co-authored-by: Cole Miller <cole@zed.dev>
Anthony-Eid
reviewed
Jun 6, 2026
Comment on lines
-3196
to
-3198
| git_panel.update(cx, |git_panel, cx| { | ||
| git_panel.project.read(cx).git_config(path, args, cx) | ||
| }) |
Contributor
There was a problem hiding this comment.
I wonder if dylint could've caught that we needed a .detach() after the .git_config here. Ok we immediately dropped this task without doing anything with it
Member
Author
There was a problem hiding this comment.
Yes! We have must_use on Task but it doesn't penetrate generics :( :( :(
zed-zippy Bot
added a commit
that referenced
this pull request
Jun 6, 2026
…k to stable) (#58716) Cherry-pick of #58705 to stable ---- We had a nested spawn that was disguising the fact that the actual `git_config` task was being dropped immediately instead of detached. This only seems to cause problems in release builds due to timing issues. 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 Release Notes: - Fixed a bug where clicking the button to trust a git repository would do nothing. Co-authored-by: Cole Miller <cole@zed.dev>
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
We had a nested spawn that was disguising the fact that the actual `git_config` task was being dropped immediately instead of detached. This only seems to cause problems in release builds due to timing issues. 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 Release Notes: - Fixed a bug where clicking the button to trust a git repository would do nothing.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We had a nested spawn that was disguising the fact that the actual
git_configtask was being dropped immediately instead of detached. This only seems to cause problems in release builds due to timing issues.Self-Review Checklist:
Release Notes: