From dbbe3798a14106d69af81d15b045ac6845e9b127 Mon Sep 17 00:00:00 2001
From: Noethix55555 <277300782+Noethix55555@users.noreply.github.com>
Date: Wed, 17 Jun 2026 19:45:15 -0400
Subject: [PATCH] fix: actually truncate over-long commit messages and
 submodule paths in lists

---
 src/popups/branchlist.rs | 11 +++++++----
 src/popups/submodules.rs |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/popups/branchlist.rs b/src/popups/branchlist.rs
index fa66ffffad..6f3e45679d 100644
--- a/src/popups/branchlist.rs
+++ b/src/popups/branchlist.rs
@@ -503,10 +503,13 @@ impl BranchListPopup {
 			let mut commit_message =
 				displaybranch.top_commit_message.clone();
 			if commit_message.len() > commit_message_length {
-				commit_message.unicode_truncate(
-					commit_message_length
-						.saturating_sub(THREE_DOTS_LENGTH),
-				);
+				commit_message = commit_message
+					.unicode_truncate(
+						commit_message_length
+							.saturating_sub(THREE_DOTS_LENGTH),
+					)
+					.0
+					.to_string();
 				commit_message += THREE_DOTS;
 			}
 
diff --git a/src/popups/submodules.rs b/src/popups/submodules.rs
index f40fe0ba5e..86299de832 100644
--- a/src/popups/submodules.rs
+++ b/src/popups/submodules.rs
@@ -361,9 +361,12 @@ impl SubmodulesListPopup {
 				.to_string();
 
 			if module_path.len() > name_length {
-				module_path.unicode_truncate(
-					name_length.saturating_sub(THREE_DOTS_LENGTH),
-				);
+				module_path = module_path
+					.unicode_truncate(
+						name_length.saturating_sub(THREE_DOTS_LENGTH),
+					)
+					.0
+					.to_string();
 				module_path += THREE_DOTS;
 			}