From fb00f8f39d2fd26dba01970cd859777609a5b91d Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Tue, 25 Jul 2017 15:25:09 -0700 Subject: [PATCH] build,travis: fix repo unshallowing git merge-base does not work as I expected Signed-off-by: Etienne Champetier --- .travis_do.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis_do.sh b/.travis_do.sh index c30e785ca2..8671165ee2 100755 --- a/.travis_do.sh +++ b/.travis_do.sh @@ -152,7 +152,8 @@ echo_blue "=== Travis ENV" env echo_blue "=== Travis ENV" -until git merge-base ${TRAVIS_COMMIT_RANGE/.../ } > /dev/null; do +until [ "$(git rev-list ${TRAVIS_COMMIT_RANGE/.../..} | tail -n1)" != "a22de9b74cf9579d1ce7e6cf1845b4afa4277b00" ]; do + # if clone depth is too small, git rev-list / diff return incorrect results echo_blue "Fetching 50 commits more" git fetch origin --deepen=50 done