X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7874880284b6fd9a66dd6297c15d2ed37163a686..6131b08d957d6808a57ba6647e5e60a057ee1e5a:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index c0a0ad49b..2f75b4199 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -15,8 +15,12 @@ do
 
     ./utils/update.php --no-npi --import-osmosis
 
-    # will trigger recompilation if necessary
-    git pull
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/master
+    else
+      echo "WARNING: git fetch failed."
+    fi
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`