Improved git tag handling

protonet · Feb 13, 2013 · c5d7018 · c5d7018
1 parent 71353f8
commit c5d7018
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/deploy/methods/git.rb b/lib/deploy/methods/git.rb
@@ -61,7 +61,7 @@ def self.included(base)
 
             cmd = []
             cmd << "git checkout #{from_branch}" if starting_branch != from_branch
-            cmd << "git tag -a release-#{Time.now.utc.strftime('%Y_%m_%d-%H_%M_%S')} -m \"#{ENV['TAG_MESSAGE']}\""
+            cmd << "git tag -a release-#{Time.now.utc.strftime('%Y-%m-%d_%H-%M-%S')} -m \"#{ENV['TAG_MESSAGE']}\""
             cmd << "git push"
             cmd << "git push --tags"
 
@@ -78,7 +78,7 @@ def self.included(base)
             end
 
             remote "cd #{dep_config.app_root}"
-            remote 'git fetch'
+            remote 'git fetch -f -t'
             remote "git checkout -f #{ENV['GIT_TAG']}"
           end
         end