Adding :track => <branch_name> and :fetch => true option to add_remote

robertodecurnex · robertodecurnex · commit 7045d8aa374c · 2013-04-11T19:14:34.000-03:00
Adding tests too closes ruby-git#40
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -337,6 +337,9 @@ def remotes
     #  @git.fetch('scotts_git')
     #  @git.merge('scotts_git/master')
     #
+    # Options:
+    #   :fetch => true
+    #   :track => <branch_name>
     def add_remote(name, url, opts = {})
       url = url.repo.path if url.is_a?(Git::Base)
       self.lib.remote_add(name, url, opts)
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -528,8 +528,8 @@ def conflicts # :yields: file, your, their
 
     def remote_add(name, url, opts = {})
       arr_opts = ['add']
-      arr_opts << '-f' if opts[:with_fetch]
-      arr_opts << '-t' << opts[:with_track] if opts[:with_track]
+      arr_opts << '-f' if opts[:with_fetch] || opts[:fetch]
+      arr_opts << '-t' << opts[:track] if opts[:track]
       arr_opts << '--'
       arr_opts << name
       arr_opts << url
diff --git a/tests/units/test_remotes.rb b/tests/units/test_remotes.rb
@@ -6,6 +6,25 @@ class TestRemotes < Test::Unit::TestCase
   def setup
     set_file_paths
   end
+
+  def test_add_remote
+    in_temp_dir do |path|
+      local = Git.clone(@wbare, 'local')
+      remote = Git.clone(@wbare, 'remote')
+
+      local.add_remote('testremote', remote)
+
+      assert(!local.branches.map{|b| b.full}.include?('testremote/master'))
+
+      local.add_remote('testremote2', remote, :fetch => true)
+
+      assert(local.branches.map{|b| b.full}.include?('remotes/testremote2/master'))
+
+      local.add_remote('testremote3', remote, :track => 'master')
+      
+      assert(local.branches.map{|b| b.full}.include?('master')) #We actually a new branch ('test_track') on the remote and track that one intead. 
+    end 
+  end
   
   def test_remote_fun
     in_temp_dir do |path|
