move truncation

Author: Joshix-1

asyncgit/src/sync/hooks.rs

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

git2-hooks/src/hookspath.rs

@@ -134,11 +134,23 @@ impl HookPaths {
 		if output.status.success() {
 			Ok(HookResult::Ok { hook })
 		} else {
-			let stderr =
+			let mut stderr =
 				String::from_utf8_lossy(&output.stderr).to_string();
-			let stdout =
+			let mut stdout =
 				String::from_utf8_lossy(&output.stdout).to_string();
 
+			if cfg!(windows) {
+				const ANSI_CLEAR: &str = "\x1B[H\x1B[2J\x1B[3J";
+
+				for text in [&mut stderr, &mut stdout] {
+					if let Some(trimmed) =
+						text.strip_suffix(ANSI_CLEAR)
+					{
+						text.truncate(trimmed.len());
+					}
+				}
+			}
+
 			Ok(HookResult::RunNotSuccessful {
 				code: output.status.code(),
 				stdout,