Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "git: Use worktree paths in the panel (#25950)" (#25995)

Browse source 
This reverts commit e7b3b8bf03.

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-03-03 23:20:41 -05:00 • committed by GitHub
parent 1086b282b8
commit 495612be2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 96 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/zed/src/zed.rs
View file

@ -22,7 +22,6 @@ use editor::ProposedChangesEditorToolbar;
use editor::{scroll::Autoscroll, Editor, MultiBuffer};
use feature_flags::{FeatureFlagAppExt, FeatureFlagViewExt, GitUiFeatureFlag};
use futures::{channel::mpsc, select_biased, StreamExt};
use git_ui::git_panel::GitPanel;
use git_ui::project_diff::ProjectDiffToolbar;
use gpui::{
actions, point, px, Action, App, AppContext as _, AsyncApp, Context, DismissEvent, Element,
@ -430,10 +429,7 @@ fn initialize_panels(
workspace.add_panel(chat_panel, window, cx);
workspace.add_panel(notification_panel, window, cx);
cx.when_flag_enabled::<GitUiFeatureFlag>(window, |workspace, window, cx| {
let entity = cx.entity();
let project = workspace.project().clone();
let app_state = workspace.app_state().clone();
let git_panel = cx.new(|cx| GitPanel::new(entity, project, app_state, window, cx));
let git_panel = git_ui::git_panel::GitPanel::new(workspace, window, cx);
workspace.add_panel(git_panel, window, cx);
});
})?;