diff options
| author | bors <bors@rust-lang.org> | 2023-08-06 20:46:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-06 20:46:37 +0000 |
| commit | 7ab10d2098b2b094fce88dc17f3bb5cd23d314ea (patch) | |
| tree | 1262b55086fd4d118553e2cc23410f8db0bbf5eb /src | |
| parent | d1174a974e97017de75a33e7b878e13acdd3d5d5 (diff) | |
| parent | 4b612a577e91c6ea95aa4fad2f2c5f866f4f0f4d (diff) | |
| download | rust-7ab10d2098b2b094fce88dc17f3bb5cd23d314ea.tar.gz rust-7ab10d2098b2b094fce88dc17f3bb5cd23d314ea.zip | |
Auto merge of #3015 - RalfJung:miri-script, r=RalfJung
rustc-pull: put a newline after the commit ID
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/miri-script/src/commands.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs index fe66f1a9bdb..ed78f80c023 100644 --- a/src/tools/miri/miri-script/src/commands.rs +++ b/src/tools/miri/miri-script/src/commands.rs @@ -173,7 +173,7 @@ 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. - sh.write_file("rust-version", &commit)?; + 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}") .run() |