Merge branch 'master' of github.com:schacon/ruby-git

robertodecurnex · robertodecurnex · commit dbfcb4077ae2 · 2014-02-03T18:17:12.000-03:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -332,8 +332,8 @@ def checkout_file(version, file)
 
     # fetches changes from a remote branch - this does not modify the working directory,
     # it just gets the changes from the remote if there are any
-    def fetch(remote = 'origin')
-      self.lib.fetch(remote)
+    def fetch(remote = 'origin', opts={})
+      self.lib.fetch(remote, opts)
     end
 
     # pushes changes to a remote repository - easiest if this is a cloned repository,
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -607,16 +607,19 @@ def tag(name, *opts)
     end
 
     
-    def fetch(remote)
-      command('fetch', remote)
+    def fetch(remote, opts)
+      arr_opts = [remote]
+      arr_opts << '--tags' if opts[:t] || opts[:tags]
+
+      command('fetch', arr_opts)
     end
     
     def push(remote, branch = 'master', opts = {})
       # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
       opts = {:tags => opts} if [true, false].include?(opts) 
       
       arr_opts = []
-      arr_opts << '--f'    if opts[:force] || opts[:f]
+      arr_opts << '--force'  if opts[:force] || opts[:f]
       arr_opts << remote
 
       command('push', arr_opts + [branch])
diff --git a/lib/git/remote.rb b/lib/git/remote.rb
@@ -11,8 +11,8 @@ def initialize(base, name)
       @fetch_opts = config['fetch']
     end
     
-    def fetch
-      @base.fetch(@name)
+    def fetch(opts={})
+      @base.fetch(@name, opts)
     end
     
     # merge this remote locally
diff --git a/tests/units/test_remotes.rb b/tests/units/test_remotes.rb
@@ -80,6 +80,33 @@ def test_remote_fun
       #puts loc.remotes.inspect
     end
   end
+
+  def test_fetch
+    in_temp_dir do |path|
+      loc = Git.clone(@wbare, 'local')
+      rem = Git.clone(@wbare, 'remote')
+
+      r = loc.add_remote('testrem', rem)
+
+      Dir.chdir('remote') do
+        rem.branch('testbranch').in_branch('tb commit') do
+          new_file('test-file', 'add file')
+          rem.add
+          true
+        end
+        rem.branch('testbranch').in_branch do
+          rem.add_tag('test-tag-in-deleted-branch')
+          false
+        end
+        rem.branch('testbranch').delete
+      end
+
+      r.fetch
+      assert(!loc.tags.map(&:name).include?('test-tag-in-deleted-branch'))
+      r.fetch :tags => true
+      assert(loc.tags.map(&:name).include?('test-tag-in-deleted-branch'))
+    end
+  end
   
   def test_push
     in_temp_dir do |path|
