From dc218fb41d02623cc90ba63300abc5071389cf03 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Wed, 29 Jun 2016 09:28:53 -0700 Subject: [PATCH] test: use merge-base for commit title checking Otherwise, will compare branch with forked master against upstream master. --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index fd4c59955..5c0496874 100755 --- a/test +++ b/test @@ -148,7 +148,7 @@ function fmt_tests { fi echo "Checking commit titles..." - git log master..HEAD --oneline | while read l; do + git log --oneline `git merge-base HEAD master`...HEAD | while read l; do commitMsg=`echo "$l" | cut -f2- -d' '` if [[ "$commitMsg" == Merge* ]]; then # ignore "Merge pull" commits