diff --git a/src/pull.rs b/src/pull.rs index 47a455b..5ae64b0 100644 --- a/src/pull.rs +++ b/src/pull.rs @@ -779,10 +779,16 @@ async fn fetch_archive_sources( .output()?; if !output.status.success() { + // patch reports rejected hunks on stdout, not stderr + let stdout = String::from_utf8_lossy(&output.stdout); let stderr = String::from_utf8_lossy(&output.stderr); - return Err( - format!("Failed to apply patch: {}\n{}", diff_path.display(), stderr).into(), - ); + return Err(format!( + "Failed to apply patch: {}\n{}{}", + diff_path.display(), + stdout, + stderr + ) + .into()); } debug!("Successfully applied patch: {}", diff_path.display());