Improve consistency with commit button tooltip between Git panel and modal (cherry-pick #25990) (#25991)

gcp-cherry-pick-bot[bot] and Joseph T. Lyons created 10 months ago

Cherry-picked Refactor more code around commit button text (#25990)

Missed this when doing https://github.com/zed-industries/zed/pull/25988

Release Notes:

- N/A

Co-authored-by: Joseph T. Lyons <[e-mail]>

Change summary

crates/git_ui/src/commit_modal.rs | 6 +-----
crates/git_ui/src/git_panel.rs    | 9 +--------
2 files changed, 2 insertions(+), 13 deletions(-)

Detailed changes

crates/git_ui/src/commit_modal.rs

@@ -262,11 +262,7 @@ impl CommitModal {
                             .map(|b| b.name.clone())
                     })
                     .unwrap_or_else(|| "<no branch>".into());
-                let tooltip = if git_panel.has_staged_changes() {
-                    "Commit staged changes"
-                } else {
-                    "Commit changes to tracked files"
-                };
+                let (_, tooltip) = git_panel.configure_commit_button(cx);
                 let title = git_panel.commit_button_title();
                 let co_authors = git_panel.render_co_authors(cx);
                 (branch, tooltip, title, co_authors)

crates/git_ui/src/git_panel.rs

@@ -1974,14 +1974,7 @@ impl GitPanel {
         } else if !self.has_write_access(cx) {
             (false, "You do not have write access to this project")
         } else {
-            (
-                true,
-                if self.has_staged_changes() {
-                    "Commit"
-                } else {
-                    "Commit Tracked"
-                },
-            )
+            (true, self.commit_button_title())
         }
     }