[v3,maintainer-tools] dim: Avoid false positives with BUG detection
diff mbox

Message ID 1458301932-17148-1-git-send-email-tvrtko.ursulin@linux.intel.com
State New
Headers show

Commit Message

Tvrtko Ursulin March 18, 2016, 11:52 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

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.

v2: Sent the incomplete version out...

v3: Rebase.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Daniel Vetter March 21, 2016, 9:37 a.m. UTC | #1
On Fri, Mar 18, 2016 at 11:52:12AM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> 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.
> 
> v2: Sent the incomplete version out...
> 
> v3: Rebase.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>

Ack, please push.
-Daniel

> ---
>  dim | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/dim b/dim
> index 67671de198a0..2d03acd8329b 100755
> --- a/dim
> +++ b/dim
> @@ -681,11 +681,13 @@ function dim_conf
>  function checkpatch_commit
>  {
>  	local commit=$1
> +	local cmd="git show --pretty=email $commit"
>  
>  	git --no-pager log --oneline -1 $commit
> -	git show $commit --pretty=email | scripts/checkpatch.pl -q --emacs --strict - || true
> +	$cmd | scripts/checkpatch.pl -q --emacs --strict - || true
>  
> -	if git show $commit --pretty=email | grep '^\+.*\WBUG' > /dev/null; then
> +	local bug_lines=$($cmd | grep -m 1 -B 1 '^\+.*\WBUG' | grep -c '^[+-].*\WBUG')
> +	if test "$bug_lines" -eq 1; then
>  		warn_or_fail "New BUG macro added"
>  	fi
>  }
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin March 21, 2016, 9:57 a.m. UTC | #2
On 21/03/16 09:37, Daniel Vetter wrote:
> On Fri, Mar 18, 2016 at 11:52:12AM +0000, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> 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.
>>
>> v2: Sent the incomplete version out...
>>
>> v3: Rebase.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>
> Ack, please push.

I didn't realize I can - pushed. :)

Thanks,

Tvrtko

Patch
diff mbox

diff --git a/dim b/dim
index 67671de198a0..2d03acd8329b 100755
--- a/dim
+++ b/dim
@@ -681,11 +681,13 @@  function dim_conf
 function checkpatch_commit
 {
 	local commit=$1
+	local cmd="git show --pretty=email $commit"
 
 	git --no-pager log --oneline -1 $commit
-	git show $commit --pretty=email | scripts/checkpatch.pl -q --emacs --strict - || true
+	$cmd | scripts/checkpatch.pl -q --emacs --strict - || true
 
-	if git show $commit --pretty=email | grep '^\+.*\WBUG' > /dev/null; then
+	local bug_lines=$($cmd | grep -m 1 -B 1 '^\+.*\WBUG' | grep -c '^[+-].*\WBUG')
+	if test "$bug_lines" -eq 1; then
 		warn_or_fail "New BUG macro added"
 	fi
 }