X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d9e4a452a85593a52ccef865ab9fe07ea78a9ae8..6af89fc6b1cf4d1130ff4760d96ad9aa7403636e:/cookbooks/nominatim/templates/default/nominatim-update-source.erb?ds=sidebyside

diff --git a/cookbooks/nominatim/templates/default/nominatim-update-source.erb b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
index 5074b237e..fb51d1eea 100644
--- 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 %>