Skip JIRA marker check when merging also from remote tracking branch

NO_JIRA

Author: siong-chin

main/githooks.py

@@ -830,7 +830,7 @@ def check_commit_msg(message, files):
     does not contain required marker.
 
     '''
-    if re.match(r'^Merge (branch|commit) \'.+?\'( of [^\s]+)? into .+', message):
+    if re.match(r'^Merge ((remote-tracking )?branch|commit) \'.+?\'( of [^\s]+)? into .+', message):
         # Not checking for JIRA or large file in commit message generated by github
         return 0
 
@@ -888,6 +888,7 @@ def _test(input, is_good=True):
         _test("Merge branch 'branch_1' into branch_2")
         _test("Merge branch 'jira_pyapi_123_abc' of github.com:ccdc-confidential/cpp-apps-main into jira_pyapi_123_abc")
         _test("Merge commit 'abcdef' into jira_mer_123_abc")
+        _test("Merge remote-tracking branch 'origin/release/2022.1' into merge_from_release")
         _test('I forgot to add the jira marker!', False)
         _test('Close but no cigar abc-1234', False)