socialcast-git-extensions 3.1.31 → 3.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a34c6c10c6b97d6535baa8b29e999d0dca40cd
-  data.tar.gz: 490cc52f1cd874d264ef7766e92cba28073f4a15
+  metadata.gz: 91d837e694388341d20e347a4f0352b9c93688b6
+  data.tar.gz: 4c937bd5d45da1e197639c9a52cba4d8e8a96562
 SHA512:
-  metadata.gz: 1312bc274de4e14fe7e36963779ec40689e5bcbff75027e9fc9c82892f106b03a0c846d0282816cf01346e6495c2d0cce2abb579eedcb6623e8c5425d2d9b162
-  data.tar.gz: f2ee71b4967ff4f311a16c70afa31110b9e5bb4e1ff383b0b3553a5cf745eacbf98cc9697eea9e8a251e6f3f42a04d499584fc67ed72cde87e2e404cdd594229
+  metadata.gz: 6d60e00c25b72164ec40c180d96eccd0cee4711dc1dfcd1b01802ce78a8bd74a4ac552f4b21bd69a22a966d67872cf6c1ecc2e46e36f7126c4f5e7af7a39f7c9
+  data.tar.gz: 30c7690e5ae4dec5095219aeafd147bdcdbd61ae569953f11524ef28fe5775f222dfffb69566e3d6818df6896c14eb964c60dbbba51d1369ffd86b821c508d9e

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

@@ -104,7 +104,7 @@ module Socialcast
       end
 
       def track_branch(branch)
-        run_cmd "git branch --track origin/#{branch}"
+        run_cmd "git branch --set-upstream-to=origin/#{branch} #{branch}"
       end
 
       # integrate a branch into a destination aggregate branch

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.31"
+    VERSION = "3.1.32"
   end
 end

data/spec/cli_spec.rb

@@ -382,7 +382,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin --delete staging",
           "git checkout -b staging",
           "git push origin staging",
-          "git branch --track origin/staging",
+          "git branch --set-upstream-to=origin/staging staging",
           "git checkout master"
         ])
       end
@@ -404,7 +404,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin --delete qa",
           "git checkout -b qa",
           "git push origin qa",
-          "git branch --track origin/qa",
+          "git branch --set-upstream-to=origin/qa qa",
           "git checkout master"
         ])
       end
@@ -426,7 +426,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin --delete qa",
           "git checkout -b qa",
           "git push origin qa",
-          "git branch --track origin/qa",
+          "git branch --set-upstream-to=origin/qa qa",
           "git checkout master",
           "git checkout master",
           "git branch -D last_known_good_master",
@@ -436,7 +436,7 @@ describe Socialcast::Gitx::CLI do
           "git push origin --delete last_known_good_qa",
           "git checkout -b last_known_good_qa",
           "git push origin last_known_good_qa",
-          "git branch --track origin/last_known_good_qa",
+          "git branch --set-upstream-to=origin/last_known_good_qa last_known_good_qa",
           "git checkout master"
         ])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.31
+  version: 3.1.32
 platform: ruby
 authors:
 - Ryan Sonnek