From 4d521a6f7165665791d8fd039255afcd138cbb3e Mon Sep 17 00:00:00 2001
From: "gcp-cherry-pick-bot[bot]"
 <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Mar 2025 00:15:08 -0400
Subject: [PATCH] git: Prevent up and down motions leaking out of the commit
 editor (cherry-pick #26501) (#26509)

---
 crates/git_ui/src/git_panel.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d904c7efdd6d4f2314c3f911a6a599424334e47c..ff459c2980a1b695584abaa6157c2e1f206a13ec 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -2757,6 +2757,12 @@ impl GitPanel {
                     .child(
                         div()
                             .pr_2p5()
+                            .on_action(|&editor::actions::MoveUp, _, cx| {
+                                cx.stop_propagation();
+                            })
+                            .on_action(|&editor::actions::MoveDown, _, cx| {
+                                cx.stop_propagation();
+                            })
                             .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
                     )
                     .child(