Merge branch 'master' into diff_name_status

Conflicts:
	lib/git/diff.rb

Author: robertodecurnex

Diff for: README.md

@@ -13,7 +13,7 @@ http://github.com/schacon/ruby-git
 You can install Ruby/Git like this:
 
     $ sudo gem install git
-    
+
 ## Code Status
 
 * [![Build Status](https://api.travis-ci.org/schacon/ruby-git.png)](https://travis-ci.org/schacon/ruby-git)
@@ -46,7 +46,7 @@ like:
 
 Here are a bunch of examples of how to use the Ruby/Git package.
 
-Ruby < 1.9 will require rubygems to be loaded. 
+Ruby < 1.9 will require rubygems to be loaded.
 
 ```ruby
     require 'rubygems'
@@ -127,10 +127,10 @@ Here are the operations that need read permission only.
     g.grep('hello')  # implies HEAD
     g.blob('v2.5:Makefile').grep('hello')
     g.tag('v2.5').grep('hello', 'docs/')
-    g.describe() 
+    g.describe()
     g.describe('0djf2aa')
     g.describe('HEAD', {:all => true, :tags => true})
-  
+
     g.diff(commit1, commit2).size
     g.diff(commit1, commit2).stats
     g.gtree('v2.5').diff('v2.6').insertions
@@ -149,7 +149,7 @@ Here are the operations that need read permission only.
     g.config # returns whole config hash
 
     g.tags # returns array of Git::Tag objects
-    
+
     g.show()
     g.show('HEAD')
     g.show('v2.8', 'README.md')
@@ -178,9 +178,11 @@ And here are the operations that will need to write to your git repository.
      g.add('file_path')                      # git add -- "file_path"
      g.add(['file_path_1', 'file_path_2'])   # git add -- "file_path_1" "file_path_2"
 
-
-     g.remove('file.txt')
-     g.remove(['file.txt', 'file2.txt'])
+     g.remove()									# git rm -f -- "."
+     g.remove('file.txt')						# git rm -f -- "file.txt"
+     g.remove(['file.txt', 'file2.txt'])		# git rm -f -- "file.txt" "file2.txt"
+     g.remove('file.txt', :recursive => true) 	# git rm -f -r -- "file.txt"
+     g.remove('file.txt', :cached => true)		# git rm -f --cached -- "file.txt"
 
      g.commit('message')
      g.commit_all('message')

Diff for: lib/git/diff.rb

@@ -1,12 +1,12 @@
 module Git
-  
+
   # object that holds the last X commits on given branch
   class Diff
     include Enumerable
-    
+
     def initialize(base, from = nil, to = nil)
       @base = base
-      @from = from && from.to_s 
+      @from = from && from.to_s
       @to = to && to.to_s
 
       @path = nil
@@ -15,7 +15,7 @@ def initialize(base, from = nil, to = nil)
       @stats = nil
     end
     attr_reader :from, :to
-   
+
     def name_status
       cache_name_status
     end
@@ -24,55 +24,55 @@ def path(path)
       @path = path
       return self
     end
-    
+
     def size
       cache_stats
       @stats[:total][:files]
     end
-    
+
     def lines
       cache_stats
       @stats[:total][:lines]
     end
-    
+
     def deletions
       cache_stats
       @stats[:total][:deletions]
     end
-    
+
     def insertions
       cache_stats
       @stats[:total][:insertions]
     end
-    
+
     def stats
       cache_stats
       @stats
     end
-    
+
     # if file is provided and is writable, it will write the patch into the file
     def patch(file = nil)
       cache_full
       @full_diff
     end
     alias_method :to_s, :patch
-    
+
     # enumerable methods
-    
+
     def [](key)
       process_full
       @full_diff_files.assoc(key)[1]
     end
-    
+
     def each(&block) # :yields: each Git::DiffFile in turn
       process_full
       @full_diff_files.map { |file| file[1] }.each(&block)
     end
-    
+
     class DiffFile
       attr_accessor :patch, :path, :mode, :src, :dst, :type
       @base = nil
-      
+
       def initialize(base, hash)
         @base = base
         @patch = hash[:patch]
@@ -87,7 +87,7 @@ def initialize(base, hash)
       def binary?
         !!@binary
       end
-      
+
       def blob(type = :dst)
         if type == :src
           @base.object(@src) if @src != '0000000'
@@ -96,27 +96,27 @@ def blob(type = :dst)
         end
       end
     end
-    
+
     private
-    
+
       def cache_full
         @full_diff ||= @base.lib.diff_full(@from, @to, {:path_limiter => @path})
       end
-      
+
       def process_full
         return if @full_diff_files
         cache_full
         @full_diff_files = process_full_diff
       end
-      
+
       def cache_stats
         @stats ||=  @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
       end
 
       def cache_name_status
         @name_status ||= @base.lib.diff_name_status(@from, @to, {:path => @path})
       end
-      
+
       # break up @diff_full
       def process_full_diff
         defaults = {
@@ -127,7 +127,11 @@ def process_full_diff
         }
         final = {}
         current_file = nil
-        @full_diff.split("\n").each do |line|
+        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
+			:invalid => :replace,
+			:undef => :replace
+		})
+        full_diff_utf8_encoded.split("\n").each do |line|
           if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]
             final[current_file] = defaults.merge({:patch => line, :path => current_file})
@@ -144,11 +148,11 @@ def process_full_diff
             if m = /^Binary files /.match(line)
               final[current_file][:binary] = true
             end
-            final[current_file][:patch] << "\n" + line 
+            final[current_file][:patch] << "\n" + line
           end
         end
         final.map { |e| [e[0], DiffFile.new(@base, e[1])] }
       end
-      
+
   end
 end