lib/cap_recipes/tasks/gitdeploy/setup.rb in crazycode-cap-recipes-0.3.39.1 vs lib/cap_recipes/tasks/gitdeploy/setup.rb in crazycode-cap-recipes-0.3.39.2

@@ -131,14 +131,14 @@
       ].join("; ")
     end
 
     def self.update_repository_remote_command(tag_name)
       [
+       # git reset --hard;git fetch;git reset --merge #{tag_name}
        "cd #{deploy_to_gitrepo}",
+       "git reset --hard",
        "git fetch",
-       "git checkout #{branch}",
-       "git merge origin/#{branch}",
-       "git checkout -b tag_#{tag_name} #{tag_name}",
+       "git reset --merge #{tag_name}",
       ].join("; ")
     end
 
   end