diff options
| author | bors <bors@rust-lang.org> | 2024-08-01 10:38:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-01 10:38:36 +0000 |
| commit | 9ec4844925a37aae5665491b43ca526d47501d48 (patch) | |
| tree | 0028ffc04c3503806c388db8c61e6b9cb1df60de | |
| parent | bf5844ea2d821c2a9d6a3c2497fb5ca42a282a96 (diff) | |
| parent | 70805f9a6b7af7b759effb2e104f186b9036e0ef (diff) | |
| download | rust-9ec4844925a37aae5665491b43ca526d47501d48.tar.gz rust-9ec4844925a37aae5665491b43ca526d47501d48.zip | |
Auto merge of #17761 - RalfJung:josh-roudntrip-error, r=lnicola
when josh-proxy screws up the roundtrip, say what the involved commits are Helps debugging https://github.com/rust-lang/rust-analyzer/issues/17733
| -rw-r--r-- | src/tools/rust-analyzer/xtask/src/release.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/xtask/src/release.rs b/src/tools/rust-analyzer/xtask/src/release.rs index 3eda2bc0274..1a1364c7d10 100644 --- a/src/tools/rust-analyzer/xtask/src/release.rs +++ b/src/tools/rust-analyzer/xtask/src/release.rs @@ -202,7 +202,10 @@ impl flags::RustcPush { 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 rust-analyzer properly. Please create a rustc PR:"); // https://github.com/github-linguist/linguist/compare/master...octocat:linguist:master |