oops track origin/branch

socialcast · Jun 22, 2015 · e24a527 · e24a527
1 parent a4b69b2
commit e24a527
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/socialcast-git-extensions/git.rb b/lib/socialcast-git-extensions/git.rb
@@ -104,7 +104,7 @@ def share_branch(branch)
       end
 
       def track_branch(branch)
-        run_cmd "git branch --track #{branch}"
+        run_cmd "git branch --track origin/#{branch}"
       end
 
       # integrate a branch into a destination aggregate branch

diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
@@ -382,7 +382,7 @@ def stub_message(message_body, params = {})
           "git push origin --delete staging",
           "git checkout -b staging",
           "git push origin staging",
-          "git branch --track staging",
+          "git branch --track origin/staging",
           "git checkout master"
         ])
       end
@@ -404,7 +404,7 @@ def stub_message(message_body, params = {})
           "git push origin --delete qa",
           "git checkout -b qa",
           "git push origin qa",
-          "git branch --track qa",
+          "git branch --track origin/qa",
           "git checkout master"
         ])
       end
@@ -426,7 +426,7 @@ def stub_message(message_body, params = {})
           "git push origin --delete qa",
           "git checkout -b qa",
           "git push origin qa",
-          "git branch --track qa",
+          "git branch --track origin/qa",
           "git checkout master",
           "git checkout master",
           "git branch -D last_known_good_master",
@@ -436,7 +436,7 @@ def stub_message(message_body, params = {})
           "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 last_known_good_qa",
+          "git branch --track origin/last_known_good_qa",
           "git checkout master"
         ])
       end