thegarage-gitx 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047d8374efd4e4538e833ad29cd8810dd46ce374
-  data.tar.gz: 21128daae406df84dba354facddb350a8269d0af
+  metadata.gz: 7dca7e6d68a09bb938cb89cc8bb2c05712452685
+  data.tar.gz: c8986acbda534129dd2cb76b66d35b2a8e7643af
 SHA512:
-  metadata.gz: cc98d873a852cc18e45204c8877277348b014c4c40858df5a64b8b315a69b1c97cb139f12e31ffaa48ae47d322ddc90611542df6f73ac5b7ebd7d9cfde20c12d
-  data.tar.gz: f7e2341f50f7d43d0ada6df0aba04da4e08eef7f6e9a9e1f10123d896b6ffa6220e1844fa75ab8c77f234d8451387ac073185f911f1cb965b28911c1ba0f1e11
+  metadata.gz: ba747230792c393f1c5e3a1ca3c399000b041b29f0c2dc2783c853ae13474f65682394c839427fe9ab6fad5a83fab02d5907edfec1d7acdc63fa4cd3ff6ba4bb
+  data.tar.gz: 3a5c090fc0d0f6d8571b0794e7f575e844717b012c7984eda6ff8b205759e1d32c87cba82c5ea537dbdef6895449204c9596fdb8fe36e4d48128a2b7fcd44098

data/lib/thegarage/gitx/cli/release_command.rb

@@ -19,7 +19,7 @@ module Thegarage
 
           checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
-          run_cmd "git pull . #{branch}"
+          run_cmd "git merge --no-ff #{branch}"
           run_cmd "git push origin HEAD"
 
           IntegrateCommand.new.integrate('staging')

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.0.5'
+    VERSION = '2.1.0'
   end
 end

data/spec/thegarage/gitx/cli/release_command_spec.rb

@@ -43,7 +43,7 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
 
         expect(cli).to receive(:run_cmd).with("git checkout master").ordered
         expect(cli).to receive(:run_cmd).with("git pull origin master").ordered
-        expect(cli).to receive(:run_cmd).with("git pull . feature-branch").ordered
+        expect(cli).to receive(:run_cmd).with("git merge --no-ff feature-branch").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
 
         cli.release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged