On Fri, Mar 18, 2016 at 11:52:12AM +0000, Tvrtko Ursulin wrote:
> 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.
>
> v2: Sent the incomplete version out...
>
> v3: Rebase.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
