riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8023 from aabadie/pr/fix_static_test_squashing

Browse Source 
dist/tools/pr_check: fix regex pattern to recognize any SHA
This commit is contained in:
Martine Lenders 2017-11-13 17:34:53 +01:00 committed by GitHub
commit 8a2939e27d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/tools/pr_check/pr_check.sh vendored
View File

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