nominatim: deploy code from a tag

[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 5074b237e3a9667955bab0099aea6c23ddc55f0c..70b6402a809b4d2bb1f59e4c1bb7d1f2febe76a2 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update-source.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
@@ -10,12 +10,12 @@ cd <%= @srcdir %>
 
 git fetch origin
 
-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 %>