Merge pull request #26 from weaveworks/this-time-for-sure

Properly exclude vendor from lint
weaveworks · Jul 15, 2016 · e9e7e6b · e9e7e6b
2 parents 2cfcf08 + df494d6
commit e9e7e6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/files-with-type b/files-with-type
@@ -4,10 +4,8 @@
 #
 # e.g.
 #     $ files-with-type text/x-shellscript k8s infra
-#
-# Assumes `find`, `xargs`, and `file` are all installed.
 
 mime_type=$1
 shift
 
-git ls-files | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
+git ls-files "$@" | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
diff --git a/lint b/lint
@@ -166,7 +166,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-        git ls-files --exclude-standard | grep -v '^vendor/'
+        git ls-files --exclude-standard | grep -vE '(^|/)vendor/'
 	else
 		git diff --cached --name-only
 	fi