socialcast-git-extensions 2.1.0 → 2.1.1

data/bin/git-reset-staging

@@ -3,8 +3,9 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-reset_branch('staging')
-reset_branch('last_known_good_staging')
+head_branch = ARGV.first || 'last_known_good_stging'
+reset_branch('staging', head_branch)
+reset_branch('last_known_good_staging', head_branch)
 
 is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
 run_cmd "socialcast share '#worklog resetting staging branch #scgitx'" unless is_quiet

data/lib/socialcast-git-extensions.rb

@@ -28,14 +28,15 @@ module Socialcast
     end
     branches
   end
-  def reset_branch(branch)
-    run_cmd "git checkout master"
+  def reset_branch(branch, head_branch = 'master')
+    return if branch == head_branch
+    run_cmd "git checkout #{head_branch}"
     run_cmd "git pull"
     run_cmd "git branch -D #{branch}" rescue nil
     run_cmd "git push origin :#{branch}" rescue nil
     run_cmd "git checkout -b #{branch}"
     run_cmd "grb publish #{branch}"
-    run_cmd "git checkout master"
+    run_cmd "git checkout #{head_branch}"
   end
 
   def integrate(branch, destination_branch = 'staging')

data/lib/socialcast-git-extensions/version.rb

@@ -1,7 +1,7 @@
 module Socialcast
   module Git
     module Extensions
-      VERSION = "2.1.0"
+      VERSION = "2.1.1"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: git extension scripts for socialcast workflow