From: Etienne Champetier <redacted>
Date: Mon, 24 Jul 2017 18:08:55 +0000 (-0700)
Subject: build,travis: fetch commits until we find merge-base
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e6013407a8178474ec600c34a779d34e96f31135;p=openwrt-packages.git

build,travis: fetch commits until we find merge-base

if the merge-base is not in the initial clone,
git diff / git rev-list will return funky results

Signed-off-by: Etienne Champetier <redacted>
---

diff --git a/.travis.yml b/.travis.yml
index ee321b375..ec74c3683 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 git:
-  depth: 1
+  depth: 10
 language: c
 dist: trusty
 sudo: false
diff --git a/.travis_do.sh b/.travis_do.sh
index 673dced26..f2fc9c603 100755
--- a/.travis_do.sh
+++ b/.travis_do.sh
@@ -146,6 +146,11 @@ echo_blue "=== Travis ENV"
 env
 echo_blue "=== Travis ENV"
 
+until git merge-base ${TRAVIS_COMMIT_RANGE/.../ } > /dev/null; do
+	echo_blue "Fetching 50 commits more"
+	git fetch origin --deepen=50
+done
+
 if [ "$TRAVIS_PULL_REQUEST" = false ] ; then
 	echo "Only Pull Requests are supported at the moment." >&2
 	exit 0