mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10096] Fixed whitespace in functions.php. [ticket/10078] Avoid \n in strings given to echo for portability. [ticket/10092] Ignore overlength comment lines in commit-msg hook.
This commit is contained in:
@@ -66,12 +66,13 @@ then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
msg=$(grep -nE '.{81,}' "$1");
|
msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
|
||||||
|
|
||||||
if [ $? -eq 0 ]
|
if [ $? -eq 0 ]
|
||||||
then
|
then
|
||||||
echo "The following lines are greater than 80 characters long:\n" >&2;
|
echo "The following lines are greater than 80 characters long:" >&2;
|
||||||
echo $msg >&2;
|
echo >&2
|
||||||
|
echo "$msg" >&2;
|
||||||
|
|
||||||
quit $ERR_LENGTH;
|
quit $ERR_LENGTH;
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user