Merge commit '930b53f5459567d79c927951168f3fc73f1c5cd0' into update-t…

…ools-subtree
weaveworks · Feb 22, 2016 · 475521c · 475521c
2 parents ea90c19 + 930b53f
commit 475521c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tools/lint b/tools/lint
@@ -85,7 +85,7 @@ function lint_go {
 		if [ -z "$IGNORE_LINT_COMMENT"  ]; then
 			lintoutput=$(golint "${filename}")
 		else
-			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports')
+			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports|ALL_CAPS')
 		fi
 		if [ -n "$lintoutput" ]; then
 			lint_result=1
@@ -148,7 +148,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/)'
+		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
 	else
 		git diff --cached --name-only
 	fi