Skip to content

Commit 35c2ee4

Browse files
committed
tools/verifygitlog.py: Skip squash merge commit message check.
Signed-off-by: zhanglinjing <[email protected]>
1 parent bc3a041 commit 35c2ee4

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

tools/verifygitlog.py

+16-11
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,11 @@ def diagnose_subject_line(subject_line, subject_line_format, err):
6868
def verify(sha, err):
6969
verbose("verify", sha)
7070
err.prefix = "commit " + sha + ": "
71-
72-
# Author and committer email.
73-
for line in git_log("%ae%n%ce", sha, "-n1"):
74-
very_verbose("email", line)
75-
if "noreply" in line:
76-
err.error("Unwanted email address: " + line)
77-
71+
7872
# Message body.
7973
raw_body = list(git_log("%B", sha, "-n1"))
80-
verify_message_body(raw_body, err)
81-
82-
83-
def verify_message_body(raw_body, err):
74+
75+
# Empty Message.
8476
if not raw_body:
8577
err.error("Message is empty")
8678
return
@@ -91,6 +83,19 @@ def verify_message_body(raw_body, err):
9183
if subject_line.startswith(prefix):
9284
verbose("Skipping ignored commit message")
9385
return
86+
87+
# Author and committer email.
88+
for line in git_log("%ae%n%ce", sha, "-n1"):
89+
very_verbose("email", line)
90+
if "noreply" in line:
91+
err.error("Unwanted email address: " + line)
92+
93+
94+
verify_message_body(raw_body, err)
95+
96+
97+
def verify_message_body(raw_body, err):
98+
subject_line = raw_body[0]
9499
very_verbose("subject_line", subject_line)
95100
subject_line_format = r"^[^!]+: [A-Z]+.+ .+\.$"
96101
if not re.match(subject_line_format, subject_line):

0 commit comments

Comments
 (0)