[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.

PHPBB3-10093
This commit is contained in:
Oleg Pudeyev 2011-12-03 16:40:05 -05:00
parent 92cdf08d48
commit 88cad5523e

View file

@ -12,11 +12,6 @@
# ln -s ../../git-tools/hooks/commit-msg \\ # ln -s ../../git-tools/hooks/commit-msg \\
# .git/hooks/commit-msg # .git/hooks/commit-msg
# #
# 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 false (warn only, do not abort)
#
# Warning/error messages use color by default if the output is a terminal # Warning/error messages use color by default if the output is a terminal
# ("output" here is normally standard error when you run git commit). # ("output" here is normally standard error when you run git commit).
# To force or disable the use of color: # To force or disable the use of color:
@ -26,13 +21,6 @@
config_ns="phpbb.hooks.commit-msg"; config_ns="phpbb.hooks.commit-msg";
if [ "$(git config --bool $config_ns.fatal)" = "false" ]
then
fatal=0;
else
fatal=1;
fi
debug_level=$(git config --int $config_ns.debug || echo 0); debug_level=$(git config --int $config_ns.debug || echo 0);
# Error codes # Error codes
@ -59,12 +47,9 @@ debug()
quit() quit()
{ {
if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ] # Now we always exit with success, since git will trash
then # entered commit message if commit-msg hook exits with a failure.
exit 0; exit 0
else
exit $1;
fi
} }
use_color() use_color()