From 1ce8a1d7ee1f361278358f5b2b3e15b449d2a8aa Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 17 Apr 2012 05:49:59 -0400
Subject: [ticket/10767] Default to non-fatal behavior.

PHPBB3-10767
---
 git-tools/hooks/commit-msg | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'git-tools/hooks')

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 3c42411602..4c9e56f555 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -14,9 +14,11 @@
 #
 # You can configure whether invalid commit messages abort commits:
 #
-# git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
+# git config phpbb.hooks.commit-msg.fatal true	(abort)
 # git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
 #
+# The default is to warn only.
+#
 # Warning/error messages use color by default if the output is a terminal
 # ("output" here is normally standard error when you run git commit).
 # To force or disable the use of color:
@@ -26,11 +28,11 @@
 
 config_ns="phpbb.hooks.commit-msg";
 
-if [ "$(git config --bool $config_ns.fatal)" = "false" ]
+if [ "$(git config --bool $config_ns.fatal)" = "true" ]
 then
-	fatal=0;
-else
 	fatal=1;
+else
+	fatal=0;
 fi
 
 debug_level=$(git config --int $config_ns.debug || echo 0);
-- 
cgit v1.2.1