From 3c51aaf065b7f41a4b3fdc44557d7684baaae5cd Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas.schievink@ferrous-systems.com>
Date: Wed, 26 Jan 2022 19:10:39 +0100
Subject: [PATCH] Fix merge commit check for git 2.35

---
 crates/rust-analyzer/tests/slow-tests/tidy.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/rust-analyzer/tests/slow-tests/tidy.rs b/crates/rust-analyzer/tests/slow-tests/tidy.rs
index b8713123fba6..37be41754ebd 100644
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
@@ -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.