patcheck: Fix false detection of 'mergeable calls' when line is removed
authorHagen Schmidt <schmidthagen@googlemail.com>
Sat, 21 Nov 2015 23:54:56 +0000 (00:54 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 22 Nov 2015 23:34:14 +0000 (00:34 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tools/patcheck

index cbdbf8d..06482e2 100755 (executable)
@@ -143,7 +143,7 @@ fi
 
 $GREP '^+++ .*Changelog' $* >/dev/null || printf "\nMissing changelog entry (ignore if minor change)\n"
 
-cat $* | tr '\n' '@' | $EGREP --color=always -o '(fprintf|av_log|printf)\([^)]*\)[+ ;@]*\1'  >$TMP && printf "\nMergeable calls\n"
+cat $* | $GREP -v '^-' | tr '\n' '@' | $EGREP --color=always -o '(fprintf|av_log|printf)\([^)]*\)[+ ;@]*\1'  >$TMP && printf "\nMergeable calls\n"
 cat $TMP | tr '@' '\n'
 
 cat $* | tr '\n' '@' | $EGREP --color=always -o '\+ *if *\( *([A-Za-z0-9_]*) *[<>]=? *[0-9]* *\) * \1 *= *[0-9]* *;[ @\\+]*else *if *\( *\1 *[<>]=? *[0-9]* *\) *\1 *= *[0-9]* *;'  >$TMP && printf "\nav_clip / av_clip_uint8 / av_clip_int16 / ...\n"