From a1edecca3b06913973d8b139cce3841e8e0de615 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 9 Oct 2018 21:51:55 -0700
Subject: tools: make Travis commit linting more robust

Use $TRAVIS_COMMIT_RANGE in .travis.yml to avoid merge commits in some
situations.

Refs: https://github.com/nodejs/node/pull/23307#issuecomment-428435859

PR-URL: https://github.com/nodejs/node/pull/23397
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 3acc282797..fad2e7f0c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       script:
         - make lint
         # Lint the first commit in the PR.
-        - git log HEAD ^$TRAVIS_BRANCH --pretty=format:'%h' --no-merges | tail -1 | xargs npx core-validate-commit --no-validate-metadata
+        - git log $TRAVIS_COMMIT_RANGE --pretty=format:'%h' --no-merges | tail -1 | xargs npx core-validate-commit --no-validate-metadata
     - name: "Test Suite"
       install:
         - ./configure
-- 
cgit v1.2.3