diff options
| author | Jonas Schievink <jonas.schievink@ferrous-systems.com> | 2022-01-26 19:10:39 +0100 |
|---|---|---|
| committer | Jonas Schievink <jonas.schievink@ferrous-systems.com> | 2022-01-26 19:10:39 +0100 |
| commit | 3c51aaf065b7f41a4b3fdc44557d7684baaae5cd (patch) | |
| tree | ca93cb1a052282d0b750859dc250a1cace685dfb | |
| parent | 28b65d3e0c4b3af910056781ecf9c4d6f1e26dc6 (diff) | |
| download | rust-3c51aaf065b7f41a4b3fdc44557d7684baaae5cd.tar.gz rust-3c51aaf065b7f41a4b3fdc44557d7684baaae5cd.zip | |
Fix merge commit check for git 2.35
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/tidy.rs | 7 |
1 files 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 b8713123fba..37be41754eb 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. |