chore: solidify lint-prcommits

conventional-changelog · May 3, 2017 · ac820c8 · ac820c8
1 parent 627b3f3
commit ac820c8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/scripts/lint-prcommits.sh b/scripts/lint-prcommits.sh
@@ -3,16 +3,20 @@ set -e
 set -u
 
 # Add the clone as remote if this is a PR from a clone
-if [ $TRAVIS_PULL_REQUEST_SLUG != "" ] && [ $TRAVIS_PULL_REQUEST_SLUG != $TRAVIS_REPO_SLUG ]; then
+if [[ $TRAVIS_PULL_REQUEST_SLUG != "" && $TRAVIS_PULL_REQUEST_SLUG != $TRAVIS_REPO_SLUG ]]; then
 	git remote add "$TRAVIS_PULL_REQUEST_SLUG" "https://github.com/$TRAVIS_PULL_REQUEST_SLUG.git"
 	git fetch "$TRAVIS_PULL_REQUEST_SLUG"
 fi
 
 # Use REMOTE/BRANCH as comparison if applicable
-if [ $TRAVIS_PULL_REQUEST_SLUG != "" ]; then
+if [[ $TRAVIS_PULL_REQUEST_SLUG != "" ]]; then
 	TO="$TRAVIS_PULL_REQUEST_SLUG/$TRAVIS_PULL_REQUEST_BRANCH"
 else
 	TO="$TRAVIS_PULL_REQUEST_BRANCH"
 fi
 
-conventional-changelog-lint --from="$TRAVIS_BRANCH" --to="$TO"
+if [[ $TRAVIS_BRANCH == $TO ]]; then
+	conventional-changelog-lint --from="HEAD~1"
+else
+	conventional-changelog-lint --from="$TRAVIS_BRANCH" --to="$TO"
+fi