Skip to content
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

Jump to bottom

fix: Fix merge commit check for git 2.35 #11348

Merged
merged 1 commit into from
Jan 26, 2022
Merged

fix: Fix merge commit check for git 2.35 #11348

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions crates/rust-analyzer/tests/slow-tests/tidy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ fn check_cargo_toml(path: &Path, text: String) {

#[test]
fn check_merge_commits() {
let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..")
.read()
.unwrap();
if !stdout.is_empty() {
let bors = cmd!("git rev-list --merges --author 'bors\\[bot\\]' HEAD~19..").read().unwrap();
let all = cmd!("git rev-list --merges HEAD~19..").read().unwrap();
if bors != all {
panic!(
"
Merge commits are not allowed in the history.
Expand Down