taproot-manufacturing/entomologist
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

git::sync(): more helpful error message when merge fails

Browse source
This commit is contained in:
Sebastian Kuzminsky 2025-07-12 14:48:04 -06:00
parent 665f02cbe8
commit 3721483c2d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/git.rs
View file

@ -251,7 +251,7 @@ pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), Git
if !result.status.success() { if !result.status.success() {
println!( println!(
"Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}", "Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}",
dir branch
); );
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap()); println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap()); println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
@ -277,7 +277,7 @@ pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), Git
if !result.status.success() { if !result.status.success() {
println!( println!(
"Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}", "Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}",
dir branch
); );
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap()); println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap()); println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
@ -297,7 +297,7 @@ pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), Git
if !result.status.success() { if !result.status.success() {
println!( println!(
"Sync failed! Merge error! Help, a human needs to fix the mess in {:?}", "Sync failed! Merge error! Help, a human needs to fix the mess in {:?}",
dir branch
); );
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap()); println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap()); println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
@ -312,7 +312,7 @@ pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), Git
if !result.status.success() { if !result.status.success() {
println!( println!(
"Sync failed! Push error! Help, a human needs to fix the mess in {:?}", "Sync failed! Push error! Help, a human needs to fix the mess in {:?}",
dir branch
); );
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap()); println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap()); println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());