Fix merge commit check for git 2.35

This commit is contained in:
Jonas Schievink 2022-01-26 19:10:39 +01:00
parent 28b65d3e0c
commit 3c51aaf065

View File

@ -139,10 +139,9 @@ fn check_cargo_toml(path: &Path, text: String) {
#[test] #[test]
fn check_merge_commits() { fn check_merge_commits() {
let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") let bors = cmd!("git rev-list --merges --author 'bors\\[bot\\]' HEAD~19..").read().unwrap();
.read() let all = cmd!("git rev-list --merges HEAD~19..").read().unwrap();
.unwrap(); if bors != all {
if !stdout.is_empty() {
panic!( panic!(
" "
Merge commits are not allowed in the history. Merge commits are not allowed in the history.