Move log storage to backup server

[chef.git] / cookbooks / nominatim / templates / default / nominatim-update-source.erb

diff --git a/cookbooks/nominatim/templates/default/nominatim-update-source.erb b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
index 43a48651150fa4acf3acb1311e8c4d2932a1ef9c..dacb6190ee132cbd8c61bdb88f2a94c69102debd 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update-source.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
@@ -9,13 +9,14 @@ date "+%c === Checking for new versions of Nominatim"
 cd <%= @srcdir %>
 
 git fetch origin
+git fetch origin -tf
 
-if git diff --exit-code origin/<%= node[:nominatim][:revision] %> >/dev/null; then
+if git diff --exit-code <%= node[:nominatim][:revision] %> >/dev/null; then
   # signal that there are no new updates
   exit 99
 fi
 
-git merge origin/<%= node[:nominatim][:revision] %>
+git checkout --detach <%= node[:nominatim][:revision] %>
 git submodule update
 
 cd <%= @builddir %>