summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-03-06 00:48:45 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-03-06 00:49:49 -0400
commitf1e0e0c652e7861196cefb8c2dd21b60c93ac88e (patch)
tree3d05dd9fef90da810bda3b9f7140c35d29c21f19
parent2728e4d55e1c9e84ee5aae4ee8e9c380198d1c99 (diff)
parent80c51bf0a524ed80c0c248374a75e7fc392e1a3d (diff)
downloadfork-ledger-f1e0e0c652e7861196cefb8c2dd21b60c93ac88e.tar.gz
fork-ledger-f1e0e0c652e7861196cefb8c2dd21b60c93ac88e.tar.bz2
fork-ledger-f1e0e0c652e7861196cefb8c2dd21b60c93ac88e.zip
Merge commit from 'master' into next
Reverted pre-commit change to only run on master Reverts part of 324f46460683255d0fa6a7b08210ca8fe7f2c398
-rwxr-xr-xtools/pre-commit4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/pre-commit b/tools/pre-commit
index dfe2cc87..b171a83b 100755
--- a/tools/pre-commit
+++ b/tools/pre-commit
@@ -2,10 +2,6 @@
"$(tg --hooks-path)"/pre-commit "$@" || exit $?
-if [ ! $(git rev-parse --symbolic-full-name HEAD) = refs/heads/master ]; then
- exit 0
-fi
-
# These are the locations I keep my temporary source and build trees in
TMPDIR=$HOME/Products/ledger-pre-commit
MIRROR=$HOME/Products/ledger-pre-commit-mirror