github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1002 from weaveworks/update-tools-subtree

Browse Source 
Update tools subtree
This commit is contained in:
Tom Wilkie
2016-02-22 15:07:21 +00:00
parent 0a2f629a65 a0bcb2023c
commit 9bb7a4413f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -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
tools/lint
View File

@@ -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/|/client/node_modules/)'
find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
else
git diff --cached --name-only
fi