mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 10:10:06 +00:00
Code Issues Releases Wiki Activity

Skip subject line length check for merge commits

Browse Source 
Some merge requests (e.g. those created for release branches) include
merge commits.  Prevent Danger from warning about excessive subject line
length for merge commits.  (While the proper way to detect a merge
commit would be to check the 'parents' attribute of a commit object,
Danger Python does not seem to populate that attribute, so a simple
string search is performed on the commit subject instead.)
This commit is contained in:
Michał Kępień 2021-01-18 14:57:47 +01:00
parent 09964e8085
commit bc42690c99
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dangerfile.py
View File

@ -49,7 +49,8 @@ target_branch = danger.gitlab.mr.target_branch
#
# - WARN if any of the following is true for any commit on the MR branch:
#
# * The length of the subject line exceeds 72 characters.
# * The length of the subject line for a non-merge commit exceeds 72
# characters.
#
# * There is no log message present (i.e. commit only has a subject) and
# the subject line does not contain any of the following strings:
@ -77,7 +78,7 @@ for commit in danger.git.commits:
fail('Fixup commits are still present in this merge request. '
'Please squash them before merging.')
fixup_error_logged = True
if len(subject) > 72:
if len(subject) > 72 and not subject.startswith('Merge branch '):
warn(
f'Subject line for commit {commit.sha} is too long: '
f'```{subject}``` ({len(subject)} > 72 characters).'