diff options
author | dragfire <[email protected]> | 2020-08-24 22:17:00 +0100 |
---|---|---|
committer | dragfire <[email protected]> | 2020-08-31 19:29:07 +0100 |
commit | cdebf02e5490989efc159cd1b4bc0645713e1dfc (patch) | |
tree | f55a96d3340f7051468280b8885f676e2c5f7ecd /xtask | |
parent | 148a60b0757d3c741681a68c86b665ea026a127a (diff) |
Add a test that forbids merge commits
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/tests/tidy.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index fd9645c23..c276b6307 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs | |||
@@ -50,6 +50,20 @@ fn rust_files_are_tidy() { | |||
50 | tidy_docs.finish(); | 50 | tidy_docs.finish(); |
51 | } | 51 | } |
52 | 52 | ||
53 | #[test] | ||
54 | fn check_merge_commits() { | ||
55 | let cmd_output = | ||
56 | run!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~4.."; echo = false); | ||
57 | match cmd_output { | ||
58 | Ok(out) => { | ||
59 | if !out.is_empty() { | ||
60 | panic!("Please rebase your branch on top of master by running `git rebase master`"); | ||
61 | } | ||
62 | } | ||
63 | Err(e) => panic!("{}", e), | ||
64 | } | ||
65 | } | ||
66 | |||
53 | fn deny_clippy(path: &PathBuf, text: &String) { | 67 | fn deny_clippy(path: &PathBuf, text: &String) { |
54 | if text.contains("[\u{61}llow(clippy") { | 68 | if text.contains("[\u{61}llow(clippy") { |
55 | panic!( | 69 | panic!( |