From 7642f7bb1510c57f49d38bcb39caad2407f9e671 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Wed, 3 Dec 2014 12:29:30 +0100 Subject: [PATCH] pr_check: Fix matching Fixes #2125 --- dist/tools/pr_check/pr_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/tools/pr_check/pr_check.sh b/dist/tools/pr_check/pr_check.sh index d1f4ebb36..7582e444c 100755 --- a/dist/tools/pr_check/pr_check.sh +++ b/dist/tools/pr_check/pr_check.sh @@ -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