1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 18:13:28 +01:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/15683] Better error message when commit message has CRLF
This commit is contained in:
Tristan Darricau 2018-07-08 18:47:37 +02:00
commit 0876a63f2b

View File

@ -147,6 +147,15 @@ then
quit $ERR_LENGTH;
fi
# Check for CR/LF line breaks
if grep -q $'\r$' "$1"
then
complain "The commit message uses CR/LF line breaks, which are not permitted." >&2
complain >&2
quit $ERR_EOF;
fi
lines=$(wc -l "$1" | awk '{ print $1; }');
expecting=header;
in_description=0;