aboutsummaryrefslogtreecommitdiff
path: root/dev/tools/pre-commit
diff options
context:
space:
mode:
authorJason Gross2018-01-16 18:12:55 +0100
committerGaƫtan Gilbert2018-02-08 17:15:20 +0100
commit8ab30d25b5ffc6a56e9ca41f446504bba4a726ad (patch)
tree8936bd55cb6f1b1cd181f6bdd023b898e43f3f32 /dev/tools/pre-commit
parentd31777adb88eb5ba54f68ac7a4cb7a2a29c1fc20 (diff)
Have the pre-commit hook also fix end-of-file nl
Diffstat (limited to 'dev/tools/pre-commit')
-rwxr-xr-xdev/tools/pre-commit11
1 files changed, 11 insertions, 0 deletions
diff --git a/dev/tools/pre-commit b/dev/tools/pre-commit
index 59cc84856d..0cd0a0b705 100755
--- a/dev/tools/pre-commit
+++ b/dev/tools/pre-commit
@@ -5,6 +5,17 @@
set -e
+CODE=0
+git diff --cached --name-only -z | xargs -0 dev/tools/check-eof-newline.sh --fix || CODE=1
+
+if [ $CODE -ne 0 ]
+then
+ 1>&2 echo "Some files had newline errors; they have been fixed in the working tree."
+ 1>&2 echo "Make sure to add them before committing."
+ 1>&2 echo "This may fix itself if you were using git commit -a, and you try again."
+ exit 1
+fi
+
if git diff-index --check --cached HEAD >/dev/null 2>&1 ;
then
: