mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #3782 - RalfJung:josh-roundtrip-error, r=RalfJung

Browse Source 
when josh-proxy screws up the roundtrip, say what the involved commits are
This commit is contained in:
bors 2024-08-01 10:29:45 +00:00
commit 9de5630c1c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/miri/miri-script/src/commands.rs
View File

@ -355,7 +355,10 @@ impl Command {
let head = cmd!(sh, "git rev-parse HEAD").read()?;
let fetch_head = cmd!(sh, "git rev-parse FETCH_HEAD").read()?;
if head != fetch_head {
bail!("Josh created a non-roundtrip push! Do NOT merge this into rustc!");
bail!(
"Josh created a non-roundtrip push! Do NOT merge this into rustc!\n\
Expected {head}, got {fetch_head}."
);
}
println!(
"Confirmed that the push round-trips back to Miri properly. Please create a rustc PR:"