fix: the 7 omitted lines issue (#5141)

Before, the CLI was always showing `... +7 lines` (with the 7 constant)
due to a double truncation

<img width="263" height="127" alt="Screenshot 2025-10-13 at 10 28 11"
src="https://github.com/user-attachments/assets/49a92d2b-c28a-4e2f-96d1-1818955470b8"
/>
This commit is contained in:
jif-oai
2025-10-14 18:15:47 +01:00
committed by GitHub
parent 268a10f917
commit 57584d6f34
3 changed files with 62 additions and 17 deletions

View File

@@ -1148,7 +1148,7 @@ pub(crate) fn new_patch_apply_failure(stderr: String) -> PlainHistoryCell {
lines.push(Line::from("✘ Failed to apply patch".magenta().bold()));
if !stderr.trim().is_empty() {
lines.extend(output_lines(
let output = output_lines(
Some(&CommandOutput {
exit_code: 1,
stdout: String::new(),
@@ -1160,7 +1160,8 @@ pub(crate) fn new_patch_apply_failure(stderr: String) -> PlainHistoryCell {
include_angle_pipe: true,
include_prefix: true,
},
));
);
lines.extend(output.lines);
}
PlainHistoryCell { lines }