pr_check: Fix matching

Fixes #2125
dev/timer
Martine Lenders 9 years ago
parent 43830dfb61
commit 7642f7bb15

@ -43,8 +43,8 @@ else
RIOT_MASTER="master"
fi
SQUASH_COMMITS="$(git log $(git merge-base HEAD "${RIOT_MASTER}")...HEAD --pretty=format:"\t%C(auto)%h %s%Creset" \
-i --grep "^.\{0,2\}SQUASH" --grep "^.\{0,2\}FIX")"
SQUASH_COMMITS="$(git log $(git merge-base HEAD "${RIOT_MASTER}")...HEAD --pretty=format:" %h %s" | \
grep -i -e "^ [0-9a-f]\{7\} .\{0,2\}SQUASH" -e "^ [0-9a-f]\{7\} .\{0,2\}FIX")"
if [ -n "${SQUASH_COMMITS}" ]; then
echo -e "${CERROR}Pull request needs squashing:${CRESET}" 1>&2

Loading…
Cancel
Save