From: Michał Kępień <michal@isc.org>
Date: Wed, 3 Jun 2020 13:45:28 +0000 (+0200)
Subject: Prevent invalid warnings about missing identifiers
X-Git-Tag: v9.17.2~29^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e062812c38787dbd37c95c6dda1d32c9dce6a3c8;p=thirdparty%2Fbind9.git

Prevent invalid warnings about missing identifiers

The Danger script inspects differences between the current version of a
given merge request's target branch and the merge request branch.  If
the latter falls behind the former, the Danger script will wrongly warn
about missing GitLab/RT identifiers because it incorrectly treats the
"+++" diff marker as an indication of the merge request adding new lines
to a file.  Tweak the relevant conditional expression to prevent such
invalid warnings from being raised.
---

diff --git a/dangerfile.py b/dangerfile.py
index 09f28cb4d65..3a047c974dd 100644
--- a/dangerfile.py
+++ b/dangerfile.py
@@ -21,7 +21,7 @@ def added_lines(target_branch, paths):
                                     '--'] + paths)
     added_lines = []
     for line in diff.splitlines():
-        if line.startswith(b'+'):
+        if line.startswith(b'+') and not line.startswith(b'+++'):
             added_lines.append(line)
     return added_lines