electrum

commit 4a65db54c9a855a57a1a4b7466c3cb4fcc21fe81
parent c76375de9188f13573910bd5b054df39a74bf168
Author: Johann Bauer <bauerj@bauerj.eu>
Date:   Wed, 30 May 2018 21:53:34 +0200

Travis: Fix Windows build from PRs

Diffstat:
M
contrib/build-wine/build-electrum-git.sh
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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