Skip to content

Commit

Permalink
Merge pull request #1002 from weaveworks/update-tools-subtree
Browse files Browse the repository at this point in the history
Update tools subtree
  • Loading branch information
tomwilkie committed Feb 22, 2016
2 parents 0a2f629 + a0bcb20 commit 9bb7a44
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ experimental/_integration/_integration
*npm-debug.log
app/static.go
prog/static.go
vendor/github.com/2opremio/go-1/codec/codecgen/codecgen
vendor/github.com/ugorji/go/codec/codecgen/codecgen
*.codecgen.go
*.generated.go
4 changes: 2 additions & 2 deletions tools/lint
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -148,7 +148,7 @@ function lint_files {

function list_files {
if [ $# -gt 0 ]; then
find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/client/node_modules/)'
find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
else
git diff --cached --name-only
fi
Expand Down

0 comments on commit 9bb7a44

Please sign in to comment.