Use branch --track when, well tracking a branch

webmat · Feb 23, 2013 · 2144ef7 · 2144ef7
1 parent 29c4802
commit 2144ef7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/git_remote_branch.rb b/lib/git_remote_branch.rb
@@ -70,7 +70,7 @@ class NotOnGitRepositoryError < RuntimeError; end
       :aliases  => %w{track follow grab fetch},
       :commands => [
         '"#{GIT} fetch #{origin}"',
-        '"#{GIT} branch --set-upstream-to=#{origin}/#{branch_name} #{branch_name}"'
+        '"#{GIT} branch --track #{branch_name} #{origin}/#{branch_name}"',
       ]
     }
   } unless defined?(COMMANDS)

diff --git a/test/functional/grb_test.rb b/test/functional/grb_test.rb
@@ -32,8 +32,8 @@ class GRBTest < Test::Unit::TestCase
 
           should_have_branch 'new_branch', :local, :remote
 
-          should "use the branch --set-upstream command" do
-            assert_match %r{branch --set-upstream}, @output
+          should "use the branch --track command" do
+            assert_match %r{branch --track}, @output
           end
         end
 
@@ -45,8 +45,8 @@ class GRBTest < Test::Unit::TestCase
 
           should_have_branch 'new_branch', :local, :remote
 
-          should "use the branch --set-upstream command" do
-            assert_match %r{branch --set-upstream}, @output
+          should "use the branch --track command" do
+            assert_match %r{branch --track}, @output
           end
         end
       end