makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10767] Revert unconditional unfatality in commit-msg hook.

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

This reverts commit 88cad5523e.

PHPBB3-10093
PHPBB3-10767
This commit is contained in:
Oleg Pudeyev 2012-04-16 03:04:29 -04:00
parent f1f2ab92b1
commit bdf21e45ca
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
git-tools/hooks/commit-msg
View file

@ -12,6 +12,11 @@
# 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:
@ -21,6 +26,13 @@
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
@ -47,9 +59,12 @@ debug()
quit() quit()
{ {
# Now we always exit with success, since git will trash if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ]
# entered commit message if commit-msg hook exits with a failure. then
exit 0 exit 0;
else
exit $1;
fi
} }
use_color() use_color()