From db717ee5165ceac58ff5f624e41de0ac265b97ef Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Mon, 12 Aug 2019 09:45:49 -0700 Subject: [build] Look further back for branch merge base --- scripts/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/environment.js b/scripts/environment.js index 0468be3720..759a7f2a42 100755 --- a/scripts/environment.js +++ b/scripts/environment.js @@ -23,7 +23,7 @@ if (pr) { }); } else { const head = process.env['CIRCLE_SHA1']; - for (const sha of execSync(`git rev-list --max-count=10 ${head}`).toString().trim().split('\n')) { + for (const sha of execSync(`git rev-list --max-count=500 ${head}`).toString().trim().split('\n')) { const base = execSync(`git branch -r --contains ${sha} origin/master origin/release-*`).toString().split('\n')[0].trim().replace(/^origin\//, ''); if (base) { const mergeBase = execSync(`git merge-base origin/${base} ${head}`).toString().trim(); -- cgit v1.2.1