From cec46079fea8577c4b7bb6ad1f0e6f9a63bb7f2c Mon Sep 17 00:00:00 2001
From: Mayank Verma <errmayank@gmail.com>
Date: Thu, 18 Dec 2025 04:22:10 +0530
Subject: [PATCH] git_ui: Preserve newlines in commit messages (#45167)

Closes #44982

Release Notes:

- Fixed Git panel to preserve newlines in commit messages
---
 crates/git_ui/src/git_panel.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 84c6e9b301d77845f115514eb2a9339fcb813701..4e94a811510ee07707bf729040d41fc8b1eb922c 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -15,6 +15,7 @@ use askpass::AskPassDelegate;
 use cloud_llm_client::CompletionIntent;
 use collections::{BTreeMap, HashMap, HashSet};
 use db::kvp::KEY_VALUE_STORE;
+use editor::RewrapOptions;
 use editor::{
     Direction, Editor, EditorElement, EditorMode, MultiBuffer, MultiBufferOffset,
     actions::ExpandAllDiffHunks,
@@ -2180,7 +2181,13 @@ impl GitPanel {
         let editor = cx.new(|cx| Editor::for_buffer(buffer, None, window, cx));
         let wrapped_message = editor.update(cx, |editor, cx| {
             editor.select_all(&Default::default(), window, cx);
-            editor.rewrap(&Default::default(), window, cx);
+            editor.rewrap_impl(
+                RewrapOptions {
+                    override_language_settings: false,
+                    preserve_existing_whitespace: true,
+                },
+                cx,
+            );
             editor.text(cx)
         });
         if wrapped_message.trim().is_empty() {