[#2] Fixed commit hook

master^2
Jef Roosens 2021-04-02 14:45:04 +02:00
parent e2493e7b19
commit 0007652e68
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
2 changed files with 8 additions and 7 deletions

View File

@ -10,9 +10,10 @@ issue_num=`echo "$branch" | grep -Po '^[0-9]+(?=-)'`
if ! grep -q '([0-9]\+)$' "$1"; then if ! grep -q '([0-9]\+)$' "$1"; then
# Error out if we can't derive issue number # Error out if we can't derive issue number
[[ -z "$issue_num" ]] && { [[ -z "$issue_num" ]] && {
>&2 echo "Couldn't derive issue number from branch. Please add one manually."; exit 1; >&2 echo "Couldn't derive issue number from branch. Please add one manually.";
exit 1;
} }
# Append issue number # Append issue number, and remove all comments
echo "(#$issue_num)" >> "$1" echo "[#$issue_num]" "$(cat "$1")" > "$1"
fi fi

View File

@ -5,10 +5,10 @@
branch=`git rev-parse --abbrev-ref HEAD` branch=`git rev-parse --abbrev-ref HEAD`
# Just lint the code before committing
make lint
# TODO should we add release branches here as well? # TODO should we add release branches here as well?
if [[ "$branch" =~ ^master|develop$ ]]; then if [[ "$branch" =~ ^master|develop$ ]]; then
make test make test > /dev/null 2>&1 || {
>&2 echo "Tests failed. check 'make test' for more info.";
exit 1;
}
fi fi