Merge branch 'maint'

* maint:
  sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
  Fix regex pattern in commit-msg
This commit is contained in:
Junio C Hamano 2006-08-13 22:58:23 -07:00
commit 460cccd3ba

View File

@ -11,4 +11,8 @@
# This example catches duplicate Signed-off-by lines.
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1 /d')"
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}