socialcast-git-extensions 3.0.6 → 3.0.7

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

@@ -73,6 +73,7 @@ module Socialcast
 
         run_cmd "git branch -D #{destination_branch}"
         run_cmd "git checkout #{destination_branch}"
+        run_cmd "git pull origin #{destination_branch}"
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
         run_cmd "git checkout #{branch}"

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.6"
+    VERSION = "3.0.7"
   end
 end

data/spec/cli_spec.rb

@@ -48,6 +48,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin HEAD",
           "git branch -D prototype",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -68,6 +69,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin HEAD",
           "git branch -D prototype",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -88,11 +90,13 @@ describe Socialcast::Gitx::CLI do
           "git push origin HEAD",
           "git branch -D staging",
           "git checkout staging",
+          "git pull origin staging",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
           "git branch -D prototype",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . staging",
           "git push origin HEAD",
           "git checkout staging",
@@ -137,6 +141,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin HEAD",
           "git branch -D staging",
           "git checkout staging",
+          "git pull origin staging",
           "git pull . master",
           "git push origin HEAD",
           "git checkout master",
@@ -271,11 +276,13 @@ describe Socialcast::Gitx::CLI do
         "git push origin HEAD",
         "git branch -D staging",
         "git checkout staging",
+        "git pull origin staging",
         "git pull . FOO",
         "git push origin HEAD",
         "git checkout FOO",
         "git branch -D prototype",
         "git checkout prototype",
+        "git pull origin prototype",
         "git pull . staging",
         "git push origin HEAD",
         "git checkout staging",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2832499571703574372
+      hash: -1512186750897379892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2832499571703574372
+      hash: -1512186750897379892
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24