Skip to content

Fix new-line at the start in no_merges handler #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Fix new-line at the start in no_merges handler #1941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/handlers/check_commits/no_merges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ fn get_default_message<'a>(
commits: impl IntoIterator<Item = &'a str>,
) -> String {
let mut message = format!(
"
The following commits have merge commits (commits with multiple parents) in your changes. \
"The following commits have merge commits (commits with multiple parents) in your changes. \
We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) \
so these commits will need to be removed for this pull request to be merged.
"
Expand Down Expand Up @@ -126,8 +125,7 @@ fn end_to_end() {
) else {
unreachable!()
};
assert_eq!(warning, "
The following commits have merge commits (commits with multiple parents) in your changes. We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) so these commits will need to be removed for this pull request to be merged.
assert_eq!(warning, "The following commits have merge commits (commits with multiple parents) in your changes. We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) so these commits will need to be removed for this pull request to be merged.
- 9cc6dce67c917fe5937e984f58f5003ccbb5c37e

You can start a rebase with the following commands:
Expand Down
Loading