From 6f7ddb36d39d878c894f883625752a5a53a3fe9b Mon Sep 17 00:00:00 2001
From: Gary The Brown <djfreakwenc@gmail.com>
Date: Fri, 29 Aug 2014 17:41:21 +0100
Subject: [PATCH] FIX: when configure tries to update the mux lists through git
 it would cause a fail if anything had been changed in the Data/dvb-scan
 folder changed the inital git pull to a git fetch and added git pull after
 the git reset to make sure they have the latest files

---
 support/getmuxlist | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/support/getmuxlist b/support/getmuxlist
index faac9ddc..e8ed054c 100755
--- a/support/getmuxlist
+++ b/support/getmuxlist
@@ -11,8 +11,9 @@ DIR=$1
 if [ -d "${DIR}/.git" ]; then
   LAST=$(pwd)
   cd "${DIR}" || exit 1
-  git pull > /dev/null 2>&1 || exit 1
+  git fetch > /dev/null 2>&1 || exit 1
   git reset --hard > /dev/null 2>&1 || exit 1
+  git pull > /dev/null 2>&1 || exit 1
   cd "${LAST}" || exit 1
 # Fetch
 elif [ ! -d "${DIR}" ]; then