From 144fd0b00d6216f08ddf64f2efb6dc2d0df3d27e Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 15 Apr 2025 12:16:24 -0400
Subject: [PATCH] Fix the git panel's commit button sometimes opening the modal
 (#28767)

Release Notes:

- N/A
---
 crates/git_ui/src/git_panel.rs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index e8d27cd442..1026776eda 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2999,7 +2999,11 @@ impl GitPanel {
             .is_some();
 
         let footer = v_flex()
-            .child(PanelRepoFooter::new(display_name, branch, Some(git_panel)))
+            .child(PanelRepoFooter::new(
+                display_name,
+                branch,
+                Some(git_panel.clone()),
+            ))
             .child(
                 panel_editor_container(window, cx)
                     .id("commit-editor-container")
@@ -3103,9 +3107,19 @@ impl GitPanel {
                                                         )
                                                         .mr_0p5(),
                                                 )
-                                                .on_click(move |_, window, cx| {
-                                                    window
-                                                        .dispatch_action(Box::new(git::Commit), cx);
+                                                .on_click({
+                                                    let git_panel = git_panel.downgrade();
+                                                    move |_, window, cx| {
+                                                        git_panel
+                                                            .update(cx, |git_panel, cx| {
+                                                                git_panel.commit_changes(
+                                                                    CommitOptions { amend: false },
+                                                                    window,
+                                                                    cx,
+                                                                );
+                                                            })
+                                                            .ok();
+                                                    }
                                                 })
                                                 .disabled(!can_commit || self.modal_open)
                                                 .tooltip({