helpers / setup - add --ff-only for git pull to avoid warnings on recent versions of git

Author: joolswills

scriptmodules/admin/setup.sh

@@ -119,7 +119,7 @@ function updatescript_setup()
         return 1
     fi
     local error
-    if ! error=$(su $user -c "git pull 2>&1 >/dev/null"); then
+    if ! error=$(su $user -c "git pull --ff-only 2>&1 >/dev/null"); then
         printMsgs "dialog" "Update failed:\n\n$error"
         popd >/dev/null
         return 1

scriptmodules/helpers.sh

@@ -417,7 +417,7 @@ function gitPullOrClone() {
     if [[ -d "$dir/.git" ]]; then
         pushd "$dir" > /dev/null
         runCmd git checkout "$branch"
-        runCmd git pull
+        runCmd git pull --ff-only
         runCmd git submodule update --init --recursive
         popd > /dev/null
     else