From: Luke Lau <luke_lau@icloud.com>
Date: Wed, 8 Aug 2018 10:29:22 +0000 (+0100)
Subject: Fix git pull
X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=aab5f2a37290fcf7e85fabc828e3379317bf8221

Fix git pull
---

diff --git a/.travis.yml b/.travis.yml
index 9d023f8..08aa051 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_install:
   - export PATH=$HOME/.local/bin:$PATH
   - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
   - stack config set system-ghc --global true
-  - export PATH=/opt/ghc/8.4.3/bin:$PATH
+  # - export PATH=/opt/ghc/8.4.3/bin:$PATH
   # - sh .download-hie.sh
   # - export PATH=$TRAVIS_BUILD_DIR:$PATH
   # - hie version
@@ -33,9 +33,10 @@ before_install:
   - cd $HOME/haskell-ide-engine
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
-  - git pull
+  - git pull origin master
   - stack --no-terminal install
   - cd $TRAVIS_BUILD_DIR
+  - hie --version
   # - git submodule init
   # - git submodule sync
   # - git submodule update