From cb28c7198b9840f424df3c3b1882c48c492f420d Mon Sep 17 00:00:00 2001 From: Markus Tauchnitz Date: Mon, 4 Nov 2024 18:19:18 +0100 Subject: [PATCH] fix(commit-msg): pattern should be only checked in uncommented text --- giticket/giticket.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/giticket/giticket.py b/giticket/giticket.py index 7b4cde0..a4b7796 100644 --- a/giticket/giticket.py +++ b/giticket/giticket.py @@ -17,12 +17,12 @@ def update_commit_message(filename, regex, mode, format_string): with io.open(filename, 'r+') as fd: contents = fd.readlines() - commit_msg = contents[0].rstrip('\r\n') + commit_msg = [line for line in contents if not line.startswith('#')] # Check if we can grab ticket info from branch name. branch = get_branch_name() # Bail if commit message already contains tickets - if any(re.search(regex, content) for content in contents): + if any(re.search(regex, commit_msg_line) for commit_msg_line in commit_msg): return tickets = re.findall(regex, branch) @@ -33,7 +33,7 @@ def update_commit_message(filename, regex, mode, format_string): new_commit_msg = format_string.format( ticket=tickets[0], tickets=', '.join(tickets), - commit_msg=commit_msg + commit_msg="\n".join(commit_msg) ) contents[0] = six.text_type(new_commit_msg + "\n")