Merge pull request pre-commit#242 from pre-commit/enforce_hooks

asottile · web-flow · commit 6b85867b0a88 · 2019-06-19T08:29:04.000-07:00
Enforce hooks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
         language: ruby
         additional_dependencies: ['scss_lint:0.57.0']
     -   id: no-github-dot-git
-        name: No need for .git for github urls
-        entry: 'github.*\.git'
+        name: No need for .git for github/gitlab urls
+        entry: '(github|gitlab).*\.git'
         files: all-repos.yaml
         language: pygrep
diff --git a/Makefile b/Makefile
@@ -1,11 +1,15 @@
 # To build scss continuously I use `watch -n 0.1 make build/main.css`
 
-all: install-hooks build/main.css all-hooks.json index.html hooks.html
+all: install-hooks check build/main.css all-hooks.json index.html hooks.html
 
 .PHONY: install-hooks
 install-hooks: venv
 	venv/bin/pre-commit install
 
+.PHONY: check
+check: venv
+	venv/bin/pre-commit run --all-files --show-diff-on-failure
+
 build/main.css: venv node_modules build scss/main.scss scss/_variables.scss
 	venv/bin/pysassc -s compressed scss/main.scss build/main.css
 
diff --git a/index.mako b/index.mako
@@ -871,7 +871,7 @@ time and stashing the unstaged changes while running hooks.
 
 ## pre-commit during merges
 
-The biggest gripe we’ve had in the past with pre-commit hooks was during merge 
+The biggest gripe we’ve had in the past with pre-commit hooks was during merge
 conflict resolution.  When working on very large projects a merge often
 results in hundreds of committed files. I shouldn’t need to run hooks on all
 of these files that I didn’t even touch!  This often led to running commit
