Commit 42bacef

author

Christian Riedel

committed

fix check for empty commit msg; exclude comment lines

1 parent 0e1121f commit 42bacefCopy full SHA for 42bacef

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,16 @@ def main(ctx, jira_tag: str, jira_url: str, verify: bool, commit_msg_file: str)`
`79`	`79`	`c_msg = cm_file.read()`
`80`	`80`
`81`	`81`	`#: Abort with empty commit-msg`
`82`		`- if c_msg == "":`
	`82`	`+ c_msg_lines = [l for l in c_msg.split("\n") if not l.startswith("#") and l != ""]`
	`83`	`+`
	`84`	`+ if len(c_msg_lines) == 0:`
`83`	`85`	`click.echo("Commit message is empty.")`
`84`	`86`	`ctx.abort()`
`85`	`87`
	`88`	`+ c_msg_cleaned = "\n".join(c_msg_lines)`
	`89`	`+`
`86`	`90`	`#: Extract tag from commit msg`
`87`		`- extract = re.search(r"(" + jira_tag.upper() + r")-?([0-9]+)?", c_msg)`
	`91`	`+ extract = re.search(r"(" + jira_tag.upper() + r")-?([0-9]+)?", c_msg_cleaned)`
`88`	`92`
`89`	`93`	`#: Check if tag is in commit msg`
`90`	`94`	`if extract is None:`

Comments

(0)