File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
src/handlers/check_commits Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ use crate::{config::IssueLinksConfig, github::GithubCommit};
7
7
static LINKED_RE : LazyLock < Regex > =
8
8
LazyLock :: new ( || Regex :: new ( r"\B([a-zA-Z-_]+/[a-zA-Z-_]+)?(#[0-9]+)\b" ) . unwrap ( ) ) ;
9
9
10
- const MERGE_IGNORE_LIST : [ & str ; 2 ] = [ "Rollup merge of " , "Auto merge of " ] ;
10
+ const MERGE_IGNORE_LIST : [ & str ; 3 ] = [ "Rollup merge of " , "Auto merge of " , "Merge pull request "] ;
11
11
12
12
pub ( super ) fn issue_links_in_commits (
13
13
_conf : & IssueLinksConfig ,
@@ -56,6 +56,10 @@ fn test_mentions_in_commits() {
56
56
"8009423d53d30b56d8cf0fec08f9852329a1a9a4" ,
57
57
"Auto merge of #123\n \n We ignore the issue link for Auto merge of" ,
58
58
) ) ;
59
+ commits. push ( dummy_commit_from_body (
60
+ "1eeacf822f6c11cd10713ddcb54a72352cacb2c2" ,
61
+ "Merge pull request #2236 from rust-lang/rustc-pull" ,
62
+ ) ) ;
59
63
60
64
assert_eq ! ( issue_links_in_commits( & config, & commits) , None ) ;
61
65
You can’t perform that action at this time.
0 commit comments