crazycode-cap-recipes 0.3.39.1 → 0.3.39.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 3
-:build: 1
+:build: 2
 :patch: 39

data/crazycode-cap-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crazycode-cap-recipes}
-  s.version = "0.3.39.1"
+  s.version = "0.3.39.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-04-27}
   s.default_executable = %q{cap-recipes}
   s.description = %q{Battle-tested capistrano recipes for debian, passenger, apache, hudson, delayed_job, juggernaut, rubygems, backgroundrb, rails and more}
   s.email = %q{crazycode@gmail.com}

data/lib/cap_recipes/tasks/gitdeploy/setup.rb

@@ -133,11 +133,11 @@ Capistrano::Configuration.instance(true).load do |configuration|
 
     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
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 39
-  - 1
-  version: 0.3.39.1
+  - 2
+  version: 0.3.39.2
 platform: ruby
 authors: 
 - crazycode
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +08:00
+date: 2011-04-27 00:00:00 +08:00
 default_executable: cap-recipes
 dependencies: []