From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> Makes sure that the diff line adding the BUG is not immediately preceded by the diff line removing the BUG. Or in other words, avoids false positives when existing BUG is edited. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> --- dim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 1e7622a1e902..e32b24988571 100755 --- a/dim +++ b/dim @@ -691,7 +691,8 @@ function shell_checkpatch local cmd=$1 $cmd | scripts/checkpatch.pl -q --strict - || true - if $cmd | grep '^\+.*\WBUG' > /dev/null; then + local bug_lines=$("$cmd" | grep -m 1 -B 1 '^\+.*\WBUG' | grep -c '^[+-]') + if test "$bug_lines" -eq 1; then warn_or_fail "New BUG macro added" fi $cmd | grep '^\+.*drm_i915_private_t' > /dev/null && echo "WARNING: New drm_i915_private_t added" || true -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx