Skip to content

git: Fix add safe directory button doing nothing (#58705) (cherry-pick to stable) #58716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zed-zippy merged 1 commit into from
Jun 6, 2026
Merged

git: Fix add safe directory button doing nothing (#58705) (cherry-pick to stable) #58716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions crates/git_ui/src/git_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3232,7 +3232,7 @@ impl GitPanel {
/// worktree to the `safe.directory` config, ensuring that, even if the user
/// that's running the application is not the owner of `.git/`, it can still
/// read the repository's contents.
fn add_safe_directory(&mut self, window: &mut Window, cx: &mut Context<Self>) {
fn add_safe_directory(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
let Some(active_repository) = &self.active_repository else {
return;
};
Expand All @@ -3250,12 +3250,10 @@ impl GitPanel {
path_arg,
];

cx.spawn_in(window, async move |git_panel, cx| {
git_panel.update(cx, |git_panel, cx| {
git_panel.project.read(cx).git_config(path, args, cx)
})
})
.detach();
self.project
.read(cx)
.git_config(path, args, cx)
.detach_and_log_err(cx);
}
}

Expand Down
Loading