octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Yuri Kunde Schlesner 2015-08-30 03:46:34 -03:00
parent 58e9f78844
commit 37319fb17f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/pre-commit
View File

@ -3,8 +3,10 @@
# Enforce citra's whitespace policy # Enforce citra's whitespace policy
git config --local core.whitespace tab-in-indent,trailing-space git config --local core.whitespace tab-in-indent,trailing-space
paths_to_check="src/ CMakeLists.txt"
# If there are whitespace errors, print the offending file names and fail. # If there are whitespace errors, print the offending file names and fail.
if ! git diff --cached --check; then if ! git diff --cached --check -- $paths_to_check ; then
cat<<END; cat<<END;
Error: This commit would contain trailing spaces or tabs, which is against this repo's policy. Error: This commit would contain trailing spaces or tabs, which is against this repo's policy.
@ -15,7 +17,7 @@ END
fi fi
# Check for tabs, since tab-in-indent catches only those at the beginning of a line # Check for tabs, since tab-in-indent catches only those at the beginning of a line
if git diff --cached | egrep '^\+.* '; then if git diff --cached -- $paths_to_check | egrep '^\+.* '; then
cat<<END; cat<<END;
Error: This commit would contain a tab, which is against this repo's policy. Error: This commit would contain a tab, which is against this repo's policy.
If you know what you are doing, you can try 'git commit --no-verify' to bypass the check. If you know what you are doing, you can try 'git commit --no-verify' to bypass the check.