mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 21:38:54 +00:00
Merge branch '3.2.x'
* 3.2.x: [ticket/15683] Better error message when commit message has CRLF
This commit is contained in:
commit
0876a63f2b
1 changed files with 9 additions and 0 deletions
|
@ -147,6 +147,15 @@ then
|
||||||
quit $ERR_LENGTH;
|
quit $ERR_LENGTH;
|
||||||
fi
|
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; }');
|
lines=$(wc -l "$1" | awk '{ print $1; }');
|
||||||
expecting=header;
|
expecting=header;
|
||||||
in_description=0;
|
in_description=0;
|
||||||
|
|
Loading…
Add table
Reference in a new issue