summaryrefslogtreecommitdiff
path: root/hooks/pre-commit
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-10-31 15:33:39 -0400
committerGitHub <noreply@github.com>2016-10-31 15:33:39 -0400
commit946b62c03dad318673138d9e9b5030aa7a195206 (patch)
treea608c553f6c905961ce23647b3282599afd30ce6 /hooks/pre-commit
parentdc1e04137c3788a49b042a6aab95a9508cdee484 (diff)
parent8b833d3a97712de3d547123bd4399ba8b530e2ac (diff)
Merge pull request #2123 from jbeich/freebsd
Fix build on DragonFly and FreeBSD
Diffstat (limited to 'hooks/pre-commit')
-rwxr-xr-xhooks/pre-commit6
1 files changed, 3 insertions, 3 deletions
diff --git a/hooks/pre-commit b/hooks/pre-commit
index ec2b5b77e..04fdaf8ec 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Enforce citra's whitespace policy
git config --local core.whitespace tab-in-indent,trailing-space
@@ -32,7 +32,7 @@ for f in $(git diff --name-only --diff-filter=ACMRTUXB --cached); do
if ! echo "$f" | egrep -q "^src/"; then
continue
fi
- d=$(diff -u "$f" <(clang-format "$f"))
+ d=$(clang-format "$f" | diff -u "$f" -)
if ! [ -z "$d" ]; then
echo "!!! $f not compliant to coding style, here is the fix:"
echo "$d"
@@ -40,4 +40,4 @@ for f in $(git diff --name-only --diff-filter=ACMRTUXB --cached); do
fi
done
-exit "$fail"
+exit "${fail-0}"