Merge branch 'master' into 355

taquitos · web-flow · commit ba1df978674f · 2018-06-25T13:50:42.000-07:00
diff --git a/README.md b/README.md
@@ -226,6 +226,7 @@ And here are the operations that will need to write to your git repository.
 
      g.fetch
      g.fetch(g.remotes.first)
+     g.fetch('origin', {:ref => 'some/ref/head'} )
 
      g.pull
      g.pull(Git::Repo, Git::Branch) # fetch and a merge
diff --git a/lib/git/diff.rb b/lib/git/diff.rb
@@ -127,10 +127,11 @@ def process_full_diff
         }
         final = {}
         current_file = nil
-        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
-			:invalid => :replace,
-			:undef => :replace
-		})
+        if @full_diff.encoding.name != "UTF-8"
+          full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", { :invalid => :replace, :undef => :replace })
+        else
+          full_diff_utf8_encoded = @full_diff
+        end
         full_diff_utf8_encoded.split("\n").each do |line|
           if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -730,6 +730,7 @@ def tag(name, *opts)
 
     def fetch(remote, opts)
       arr_opts = [remote]
+      arr_opts << opts[:ref] if opts[:ref]
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
 
diff --git a/tests/units/test_remotes.rb b/tests/units/test_remotes.rb
@@ -122,6 +122,34 @@ def test_fetch
       assert(loc.tags.map(&:name).include?('test-tag-in-deleted-branch'))
     end
   end
+
+  def test_fetch_ref_adds_ref_option
+    in_temp_dir do |path|
+      loc = Git.clone(@wbare, 'local')
+      rem = Git.clone(@wbare, 'remote', :config => 'receive.denyCurrentBranch=ignore')
+      loc.add_remote('testrem', rem)
+      
+      loc.chdir do
+        new_file('test-file1', 'gonnaCommitYou')
+        loc.add
+        loc.commit('master commit 1')
+        first_commit_sha = loc.log.first.sha
+        
+        new_file('test-file2', 'gonnaCommitYouToo')
+        loc.add
+        loc.commit('master commit 2')
+        second_commit_sha = loc.log.first.sha
+
+        # Make sure fetch message only has the first commit when we fetch the first commit
+        assert(loc.fetch('origin', {:ref => first_commit_sha}).include?(first_commit_sha))
+        assert(!loc.fetch('origin', {:ref => first_commit_sha}).include?(second_commit_sha))
+
+        # Make sure fetch message only has the second commit when we fetch the second commit
+        assert(loc.fetch('origin', {:ref => second_commit_sha}).include?(second_commit_sha))
+        assert(!loc.fetch('origin', {:ref => second_commit_sha}).include?(first_commit_sha))        
+      end      
+    end
+  end
   
   def test_push
     in_temp_dir do |path|
