Travis: Fix Windows build from PRs

2018-05-30 21:53:34 +02:00 · 2018-05-30 21:53:34 +02:00 · 4a65db54c9
commit 4a65db54c9
parent c76375de91
1 changed files with 1 additions and 1 deletions
--- a/contrib/build-wine/build-electrum-git.sh
+++ b/contrib/build-wine/build-electrum-git.sh
@ -31,7 +31,7 @@ if [ ! -z "$1" ]; then
    if ! git cat-file -e "$1" 2> /dev/null
    then  # can't find target
        # try pull requests
-        git config --local --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pr/*'
+        git config --local --add remote.origin.fetch '+refs/pull/*/merge:refs/remotes/origin/pr/*'
        git fetch --all
    fi
    git checkout $1