From f96fd928d745fe65e5b21decb0cfc4f36a15dcb4 Mon Sep 17 00:00:00 2001
From: Miao <one.lemorage@gmail.com>
Date: Mon, 29 Sep 2025 22:28:14 +0800
Subject: [PATCH] git: Fix git modal and panel amend tooltip (#39008)

Closes #38783

Release Notes:

- Fixed the amend button tooltip shortcut in Git panel and modal.
---
 crates/git_ui/src/commit_modal.rs | 6 +++++-
 crates/git_ui/src/git_panel.rs    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
index b7088f27e9..4637b873ec 100644
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -455,7 +455,11 @@ impl CommitModal {
                                 if can_commit {
                                     Tooltip::with_meta_in(
                                         tooltip,
-                                        Some(&git::Commit),
+                                        Some(if is_amend_pending {
+                                            &git::Amend
+                                        } else {
+                                            &git::Commit
+                                        }),
                                         format!(
                                             "git commit{}{}",
                                             if is_amend_pending { " --amend" } else { "" },
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d97f628233..8f9320b217 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -3458,7 +3458,7 @@ impl GitPanel {
                         if can_commit {
                             Tooltip::with_meta_in(
                                 tooltip,
-                                Some(&git::Commit),
+                                Some(if amend { &git::Amend } else { &git::Commit }),
                                 format!(
                                     "git commit{}{}",
                                     if amend { " --amend" } else { "" },