From ef5a574af48d9300c2e44674f2187c6d7d6d951a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 4 May 2024 22:44:56 +0200 Subject: rustc_pull: explain order of operations --- src/tools/miri/miri-script/src/commands.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs index 7e34ad050b3..6d07455c0de 100644 --- a/src/tools/miri/miri-script/src/commands.rs +++ b/src/tools/miri/miri-script/src/commands.rs @@ -239,6 +239,8 @@ impl Command { // the merge has confused the heck out of josh in the past. // We pass `--no-verify` to avoid running git hooks like `./miri fmt` that could in turn // trigger auto-actions. + // We do this before the merge so that if there are merge conflicts, we have + // the right rust-version file while resolving them. sh.write_file("rust-version", format!("{commit}\n"))?; const PREPARING_COMMIT_MESSAGE: &str = "Preparing for merge from rustc"; cmd!(sh, "git commit rust-version --no-verify -m {PREPARING_COMMIT_MESSAGE}") -- cgit 1.4.1-3-g733a5