Merge 093484552f
into 0e575b2809
This commit is contained in:
commit
9d18052c43
1 changed files with 3 additions and 1 deletions
|
@ -1814,6 +1814,7 @@ impl GitBinary {
|
||||||
output.status.success(),
|
output.status.success(),
|
||||||
GitBinaryCommandError {
|
GitBinaryCommandError {
|
||||||
stdout: String::from_utf8_lossy(&output.stdout).to_string(),
|
stdout: String::from_utf8_lossy(&output.stdout).to_string(),
|
||||||
|
stderr: String::from_utf8_lossy(&output.stderr).to_string(),
|
||||||
status: output.status,
|
status: output.status,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -1836,9 +1837,10 @@ impl GitBinary {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
#[error("Git command failed: {stdout}")]
|
#[error("Git command failed: {stdout} {stderr}")]
|
||||||
struct GitBinaryCommandError {
|
struct GitBinaryCommandError {
|
||||||
stdout: String,
|
stdout: String,
|
||||||
|
stderr: String,
|
||||||
status: ExitStatus,
|
status: ExitStatus,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue