summaryrefslogtreecommitdiff
path: root/git-hooks
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-03-24 18:01:34 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-03-24 18:04:20 +0100
commit81dbafd1227fbd976e343c1ce880b4020112808a (patch)
tree2ec8cf22ae3680e30654a470ec8f6857be10be51 /git-hooks
parent04cae9ec1e1f04833b06fe9f24e23cfaf5265599 (diff)
git-hooks: commit-msg should not search for whitespace in the diff itself
The additional sed removes every line after seeing the first line starting with a #, just like git will do it later as well. See: http://article.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/26794
Diffstat (limited to 'git-hooks')
-rwxr-xr-xgit-hooks/commit-msg2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/commit-msg b/git-hooks/commit-msg
index 378acfa00c57..f2bcb3f13a5a 100755
--- a/git-hooks/commit-msg
+++ b/git-hooks/commit-msg
@@ -57,7 +57,7 @@ fi
# Check for whitespace in front of *'s
-if [ -n "`grep '^[[:space:]]\+\*.*:' $1`" -a -z "`grep '^\*' $1`" ] ; then
+if [ -n "`sed '/^#/,$d' $1 | grep '^[[:space:]]\+\*.*:'`" -a -z "`grep '^\*' $1`" ] ; then
abort "$1" "Please don't use whitespace in front of '* file: Description.' entries."
fi