more trimming

Author: Joshix-1

asyncgit/src/sync/hooks.rs

@@ -24,7 +24,15 @@ impl From<git2_hooks::HookResult> for HookResult {
 			} => {
 				const ANSI_CLEAR: &str = "\x1B[H\x1B[2J\x1B[3J";
 
-				let mut combined = format!("{stdout}{stderr}");
+				let mut combined = stdout;
+
+				if let Some(trimmed) =
+					combined.strip_suffix(ANSI_CLEAR)
+				{
+					combined.truncate(trimmed.len());
+				}
+
+				combined.push_str(&stderr);
 
 				if let Some(trimmed) =
 					combined.strip_suffix(ANSI_CLEAR)