shadowsocks-libev: support disable_sni for ss_server section

[feed/packages.git] / .travis_do.sh

diff --git a/.travis_do.sh b/.travis_do.sh
index c30e785ca272ff3174f9a5e5336e899f46c2f61a..8671165ee2d1ae46f5f4ae96b31435d01629704e 100755 (executable)
--- 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