From 1f5760c37f0478ac20e897eedf627eb786a24307 Mon Sep 17 00:00:00 2001 From: Robert Walker Date: Fri, 10 Jul 2020 22:02:20 +0100 Subject: [PATCH] build_multilib_wine: fix function: git_pull() * use: git pull --force --- src/build_multilib_wine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build_multilib_wine b/src/build_multilib_wine index 4603327..f318a90 100755 --- a/src/build_multilib_wine +++ b/src/build_multilib_wine @@ -1110,7 +1110,7 @@ function git_pull() git checkout "master" || die "git checkout \"master\" failed (\"${1}\")" $? git clean -xdfq || die "git clean -xdfq failed (\"${1}\")" $? git reset --hard "origin/master" || die "git reset --hard \"master\" failed (\"${1}\")" $? - git pull || die "git pull failed (\"${1}\")" $? + git pull --force || die "git pull --force failed (\"${1}\")" $? popd_wrapper }