From cfbac19c263589e8e43951a703b02e15090a1fe9 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 24 2019 18:11:52 +0000
Subject: Merge branch 'cboltz-static-pull' into 'production'


replace recommended git commands with working ones

See merge request infra/salt!240
---

diff --git a/salt/profile/static/files/git_pull_and_update.sh b/salt/profile/static/files/git_pull_and_update.sh
index 2d52ca1..46166c3 100644
--- a/salt/profile/static/files/git_pull_and_update.sh
+++ b/salt/profile/static/files/git_pull_and_update.sh
@@ -23,7 +23,7 @@ EXPECTED_SHA256="$(echo '{%- for file, sha256 in expected_gitmodules.items() %}
 # update all git repos, exit if one of them fails (better outdated than inconsistent)
 cd "$BASEDIR" || exit 1
 for dir in $GIT_DIRS ; do
-    cd "$BASEDIR/$dir" && git fetch -q && git reset -q --hard || exit 1
+    cd "$BASEDIR/$dir" && git pull -q || exit 1
 done
 
 # check if any .gitmodules appeared or disappeared