Skip to content

Commit

Permalink
Auto merge of #3830 - ehuss:fix-squash-message, r=JohnTitor
Browse files Browse the repository at this point in the history
Fix squash message warning.

rust-lang/rust#87671 added a warning when backslash continuations eat multiple lines. This uncovered that the message for squashing the index was missing some blank lines. This adds some newlines to silence the warning and fix the message formatting.
  • Loading branch information
bors committed Aug 16, 2021
2 parents 1097171 + 8fb8972 commit 51c757b
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,8 @@ pub fn squash_index(env: &Environment) -> Result<(), PerformError> {
let now = Utc::now().format("%Y-%m-%d");
let original_head = repo.head_oid()?.to_string();
let msg = format!("Collapse index into one commit\n\n\
Previous HEAD was {}, now on the `snapshot-{}` branch\n\n\
More information about this change can be found [online] and on [this issue].\n\n\
[online]: https://internals.rust-lang.org/t/cargos-crate-index-upcoming-squash-into-one-commit/8440\n\
[this issue]: https://github.com/rust-lang/crates-io-cargo-teams/issues/47", original_head, now);

Expand Down

0 comments on commit 51c757b

Please sign in to comment.