File tree Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -834,6 +834,10 @@ def check_commit_msg(message, files):
834834 # Not checking for JIRA or large file in commit message generated by github
835835 return 0
836836
837+ if re .match (r'^Merge pull request #.+ from .+' , message ):
838+ # Not checking for JIRA or large file in commit message generated by github
839+ return 0
840+
837841 if NO_JIRA_MARKER not in message :
838842 if jira_id_pattern .search (message ) is None :
839843 _fail ('Every commit should contain a Jira issue ID or the text '
@@ -889,6 +893,7 @@ def _test(input, is_good=True):
889893 _test ("Merge branch 'jira_pyapi_123_abc' of github.com:ccdc-confidential/cpp-apps-main into jira_pyapi_123_abc" )
890894 _test ("Merge commit 'abcdef' into jira_mer_123_abc" )
891895 _test ("Merge remote-tracking branch 'origin/release/2022.1' into merge_from_release" )
896+ _test ("Merge pull request #1 from patch-1" )
892897 _test ('I forgot to add the jira marker!' , False )
893898 _test ('Close but no cigar abc-1234' , False )
894899
You can’t perform that action at this time.
0 commit comments