summaryrefslogtreecommitdiff
path: root/hooks/pre-commit
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-08-30 03:46:34 -0300
committerGravatar Yuri Kunde Schlesner2015-08-31 07:12:25 -0300
commit37319fb17fa189d48aa8ca75bff40c977ff2cd44 (patch)
tree584367198c9f919a2e46ab226c09d6971b8df944 /hooks/pre-commit
parentMerge pull request #1049 from Subv/stencil (diff)
downloadyuzu-37319fb17fa189d48aa8ca75bff40c977ff2cd44.tar.gz
yuzu-37319fb17fa189d48aa8ca75bff40c977ff2cd44.tar.xz
yuzu-37319fb17fa189d48aa8ca75bff40c977ff2cd44.zip
Only check src/ directory for whitespace errors in the pre-commit hook
This allows importing of external libraries into externals/ without having to reformat them. Unfortunately it also allows whitespace to be introduced in files like the root CMakeLists.txt, but that is a small downside compared to the tradeoff.
Diffstat (limited to 'hooks/pre-commit')
-rwxr-xr-xhooks/pre-commit6
1 files changed, 4 insertions, 2 deletions
diff --git a/hooks/pre-commit b/hooks/pre-commit
index bad84b14b..c100bb634 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -3,8 +3,10 @@
3# Enforce citra's whitespace policy 3# Enforce citra's whitespace policy
4git config --local core.whitespace tab-in-indent,trailing-space 4git config --local core.whitespace tab-in-indent,trailing-space
5 5
6paths_to_check="src/ CMakeLists.txt"
7
6# If there are whitespace errors, print the offending file names and fail. 8# If there are whitespace errors, print the offending file names and fail.
7if ! git diff --cached --check; then 9if ! git diff --cached --check -- $paths_to_check ; then
8 cat<<END; 10 cat<<END;
9 11
10Error: This commit would contain trailing spaces or tabs, which is against this repo's policy. 12Error: This commit would contain trailing spaces or tabs, which is against this repo's policy.
@@ -15,7 +17,7 @@ END
15fi 17fi
16 18
17# Check for tabs, since tab-in-indent catches only those at the beginning of a line 19# Check for tabs, since tab-in-indent catches only those at the beginning of a line
18if git diff --cached | egrep '^\+.* '; then 20if git diff --cached -- $paths_to_check | egrep '^\+.* '; then
19 cat<<END; 21 cat<<END;
20Error: This commit would contain a tab, which is against this repo's policy. 22Error: This commit would contain a tab, which is against this repo's policy.
21If you know what you are doing, you can try 'git commit --no-verify' to bypass the check. 23If you know what you are doing, you can try 'git commit --no-verify' to bypass the check.