only git fetch should be non-fatal, merge errors still need to be caught
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 21 Sep 2013 08:11:22 +0000 (10:11 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 21 Sep 2013 08:11:22 +0000 (10:11 +0200)
cookbooks/nominatim/templates/default/updater.erb

index acadc9a02525cc93c2ee5fcd1485f66a78e00065..2f75b4199638af23c8e9fb23e631ef587716f27b 100644 (file)
@@ -15,9 +15,11 @@ do
 
     ./utils/update.php --no-npi --import-osmosis
 
-    # will trigger recompilation if necessary
-    if ! git pull; then
-      echo "WARNING: git update failed."
+    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