Browse Source

Merge pull request #5812 from heyitsanthony/test-merge-base

test: use merge-base for commit title checking
Anthony Romano 9 years ago
parent
commit
ff908b4ba8
1 changed files with 1 additions and 1 deletions
  1. 1 1
      test

+ 1 - 1
test

@@ -148,7 +148,7 @@ function fmt_tests {
 	fi
 	fi
 
 
 	echo "Checking commit titles..."
 	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' '`
 		commitMsg=`echo "$l" | cut -f2- -d' '`
 		if [[ "$commitMsg" == Merge* ]]; then
 		if [[ "$commitMsg" == Merge* ]]; then
 			# ignore "Merge pull" commits
 			# ignore "Merge pull" commits