git 1.2.9.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6345c26432a4a89a14892294e9626305746cfc43
-  data.tar.gz: 1c6fa07d75bcbd5947fd523416c36949b9c65ae8
+  metadata.gz: 57559d500d07f7561f8a62e21f87fb73b0759b98
+  data.tar.gz: 4946775180b583063b68a9fa2ca507bbe2f3242f
 SHA512:
-  metadata.gz: a9d68fd1d7e5644ca79a31ee30cdce423c505178536a875386a41eaf8d42320a98fa738e09956f81e06845de1ccd48176c73c0e7cab3fa96b7fb335f8bf0054f
-  data.tar.gz: cd5b1a434f47f1b50da03721f4bbc9d343349e1f0287e342ce62378dc23dee37566ca262475204f1e6c46a2a4f0d373cb07d168119efe1b836c164414fb73c07
+  metadata.gz: a5f355d639e30163b6f56c0aacfc0bd5bb441dbfcf961b22b838a25dc8e2775afa8528e90f021b750c3431c9fdcce5795e04fd8b6b5eb2e271d32bfdeb26e3ce
+  data.tar.gz: c49b547f7c47b6f0cc522ae4f0767c1f3a86817c45fb01f1d712bee8c9e1144075ab832e8eb863263bd55caad6a38b38b3c19c7059091abb7f7fe626fc6c92d1

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 1.3.0
+
+ * Dropping Ruby 1.8.x support
+
+== 1.2.10
+
+ * Adding Git::Diff.name_status
+ * Checking and fixing encoding on commands output to prevent encoding errors afterwards
+
 == 1.2.9
 
 * Adding Git.configure (to configure the git env)
@@ -14,9 +23,9 @@
 * Improving Git::Object::Tag. Adding annotated?, tagger and message
 * Supporting a submodule path as a valid repo
 * Git.checkout - supporting -f and -b
-* Git.clone - supporting --branch 
+* Git.clone - supporting --branch
 * Git.fetch - supporting --prune
-* Git.tag - supporting 
+* Git.tag - supporting
 
 == 1.2.8
 
@@ -24,7 +33,7 @@
 * revparse: Supporting ref names containing SHA like substrings (40-hex strings)
 * Fix warnings on Ruby 2.1.2
 
-== 1.2.7 
+== 1.2.7
 
 * Fixing mesages encoding
 * Fixing -f flag in git push
@@ -47,9 +56,9 @@
 * Git.add - supporting --fore
 * Git.init - supporting --bare
 * Git.commit - supporting --all and --amend
-* Added Git.remote_remote, Git.revert and Git.clean 
+* Added Git.remote_remote, Git.revert and Git.clean
 * Added Bundler to the formula
-* Travis configuration 
+* Travis configuration
 * Licence included with the gem
 
 == 1.0.4

data/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,12 +127,13 @@ 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.diff(commit1, commit2).name_status
     g.gtree('v2.5').diff('v2.6').insertions
     g.diff('gitsearch1', 'v2.5').path('lib/')
     g.diff('gitsearch1', @git.gtree('v2.5'))
@@ -149,7 +150,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 +179,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')

data/VERSION

@@ -1 +1,2 @@
-1.2.9.1
+1.3.0
+

data/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,60 +15,64 @@ module Git
       @stats = nil
     end
     attr_reader :from, :to
-    
+
+    def name_status
+      cache_name_status
+    end
+
     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]
@@ -83,7 +87,7 @@ module Git
       def binary?
         !!@binary
       end
-      
+
       def blob(type = :dst)
         if type == :src
           @base.object(@src) if @src != '0000000'
@@ -92,28 +96,27 @@ module Git
         end
       end
     end
-    
+
     private
-    
+
       def cache_full
-        unless @full_diff
-          @full_diff = @base.lib.diff_full(@from, @to, {:path_limiter => @path})
-        end
+        @full_diff ||= @base.lib.diff_full(@from, @to, {:path_limiter => @path})
       end
-      
+
       def process_full
-        unless @full_diff_files
-          cache_full
-          @full_diff_files = process_full_diff
-        end
+        return if @full_diff_files
+        cache_full
+        @full_diff_files = process_full_diff
       end
-      
+
       def cache_stats
-        unless @stats
-          @stats = @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
-        end
+        @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 = {
@@ -124,7 +127,11 @@ module Git
         }
         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})
@@ -141,11 +148,11 @@ module Git
             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

data/lib/git/lib.rb

@@ -1,12 +1,12 @@
 require 'tempfile'
 
 module Git
-  
-  class GitExecuteError < StandardError 
+
+  class GitExecuteError < StandardError
   end
-  
+
   class Lib
-     
+
     @@semaphore = Mutex.new
 
     def initialize(base = nil, logger = nil)
@@ -14,14 +14,14 @@ module Git
       @git_index_file = nil
       @git_work_dir = nil
       @path = nil
-      
+
       if base.is_a?(Git::Base)
         @git_dir = base.repo.path
         @git_index_file = base.index.path if base.index
         @git_work_dir = base.dir.path if base.dir
       elsif base.is_a?(Hash)
         @git_dir = base[:repository]
-        @git_index_file = base[:index] 
+        @git_index_file = base[:index]
         @git_work_dir = base[:working_directory]
       end
       @logger = logger
@@ -39,7 +39,7 @@ module Git
 
       command('init', arr_opts, false)
     end
-    
+
     # tries to clone the given repo
     #
     # returns {:repository} (if bare)
@@ -53,13 +53,13 @@ module Git
     #  :path::      directory where the repo will be cloned
     #  :remote::    name of remote (rather than 'origin')
     #  :recursive:: after the clone is created, initialize all submodules within, using their default settings.
-    # 
+    #
     # TODO - make this work with SSH password or auth_key
     #
     def clone(repository, name, opts = {})
       @path = opts[:path] || '.'
       clone_dir = opts[:path] ? File.join(@path, name) : name
-      
+
       arr_opts = []
       arr_opts << '--bare' if opts[:bare]
       arr_opts << '--branch' << opts[:branch] if opts[:branch]
@@ -72,15 +72,15 @@ module Git
 
       arr_opts << repository
       arr_opts << clone_dir
-      
+
       command('clone', arr_opts)
-      
+
       opts[:bare] ? {:repository => clone_dir} : {:working_directory => clone_dir}
     end
-    
-    
+
+
     ## READ COMMANDS ##
-    
+
     #
     # Returns most recent tag that is reachable from a commit
     #
@@ -111,14 +111,14 @@ module Git
       arr_opts << '--long' if opts[:long]
       arr_opts << '--always' if opts[:always]
       arr_opts << '--exact-match' if opts[:exact_match] || opts[:"exact-match"]
-      
+
       arr_opts << '--dirty' if opts['dirty'] == true
       arr_opts << "--dirty=#{opts['dirty']}" if opts['dirty'].is_a?(String)
 
       arr_opts << "--abbrev=#{opts['abbrev']}" if opts[:abbrev]
       arr_opts << "--candidates=#{opts['candidates']}" if opts[:candidates]
       arr_opts << "--match=#{opts['match']}" if opts[:match]
-      
+
       arr_opts << committish if committish
 
       return command('describe', arr_opts)
@@ -126,27 +126,27 @@ module Git
 
     def log_commits(opts={})
       arr_opts = log_common_options(opts)
-    
+
       arr_opts << '--pretty=oneline'
-     
+
       arr_opts += log_path_options(opts)
 
       command_lines('log', arr_opts, true).map { |l| l.split.first }
     end
-    
+
     def full_log_commits(opts={})
       arr_opts = log_common_options(opts)
-    
+
       arr_opts << '--pretty=raw'
       arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
-   
+
       arr_opts += log_path_options(opts)
-      
+
       full_log = command_lines('log', arr_opts, true)
 
       process_commit_log_data(full_log)
     end
-    
+
     def revparse(string)
       return string if string =~ /^[A-Fa-f0-9]{40}$/  # passing in a sha - just no-op it
       rev = ['head', 'remotes', 'tags'].map do |d|
@@ -157,33 +157,33 @@ module Git
       return File.read(rev).chomp if rev
       command('rev-parse', string)
     end
-    
+
     def namerev(string)
       command('name-rev', string).split[1]
     end
-    
+
     def object_type(sha)
       command('cat-file', ['-t', sha])
     end
-    
+
     def object_size(sha)
       command('cat-file', ['-s', sha]).to_i
     end
-    
+
     # returns useful array of raw commit object data
     def commit_data(sha)
       sha = sha.to_s
       cdata = command_lines('cat-file', ['commit', sha])
       process_commit_data(cdata, sha, 0)
     end
-    
+
     def process_commit_data(data, sha = nil, indent = 4)
       hsh = {
         'sha'     => sha,
         'message' => '',
         'parent'  => []
       }
-      
+
       loop do
         key, *value = data.shift.split
 
@@ -195,7 +195,7 @@ module Git
           hsh[key] = value.join(' ')
         end
       end
-      
+
       hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
 
       return hsh
@@ -220,27 +220,27 @@ module Git
 
         hsh[key] = value.join(' ')
       end
-      
+
       hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
 
       return hsh
     end
-    
+
     def process_commit_log_data(data)
       in_message = false
-            
-      hsh_array = []       
+
+      hsh_array = []
 
       hsh = nil
-    
+
       data.each do |line|
         line = line.chomp
-        
+
         if line[0].nil?
-          in_message = !in_message 
+          in_message = !in_message
           next
         end
-       
+
         if in_message
           hsh['message'] << "#{line[4..-1]}\n"
           next
@@ -248,7 +248,7 @@ module Git
 
         key, *value = line.split
         value = value.join(' ')
-        
+
         case key
           when 'commit'
             hsh_array << hsh if hsh
@@ -259,36 +259,36 @@ module Git
             hsh[key] = value
         end
       end
-      
+
       hsh_array << hsh if hsh
-        
+
       return hsh_array
     end
-    
+
     def object_contents(sha, &block)
       command('cat-file', ['-p', sha], &block)
     end
 
     def ls_tree(sha)
       data = {'blob' => {}, 'tree' => {}}
-      
+
       command_lines('ls-tree', sha).each do |line|
         (info, filenm) = line.split("\t")
         (mode, type, sha) = info.split
         data[type][filenm] = {:mode => mode, :sha => sha}
       end
-      
+
       data
     end
 
     def mv(file1, file2)
       command_lines('mv', ['--', file1, file2])
     end
-        
+
     def full_tree(sha)
       command_lines('ls-tree', ['-r', sha])
     end
-            
+
     def tree_depth(sha)
       full_tree(sha).size
     end
@@ -296,10 +296,10 @@ module Git
     def change_head_branch(branch_name)
       command('symbolic-ref', ['HEAD', "refs/heads/#{branch_name}"])
     end
-    
+
     def branches_all
       arr = []
-      command_lines('branch', '-a').each do |b| 
+      command_lines('branch', '-a').each do |b|
         current = (b[0, 2] == '* ')
         arr << [b.gsub('* ', '').strip, current]
       end
@@ -312,7 +312,7 @@ module Git
       Dir.chdir(dir) { files = Dir.glob('**/*').select { |f| File.file?(f) } } rescue nil
       files
     end
-    
+
     def branch_current
       branches_all.select { |b| b[1] }.first[0] rescue nil
     end
@@ -334,14 +334,14 @@ module Git
 
       hsh = {}
       command_lines('grep', grep_opts).each do |line|
-        if m = /(.*)\:(\d+)\:(.*)/.match(line)        
+        if m = /(.*)\:(\d+)\:(.*)/.match(line)
           hsh[m[1]] ||= []
-          hsh[m[1]] << [m[2].to_i, m[3]] 
+          hsh[m[1]] << [m[2].to_i, m[3]]
         end
       end
       hsh
     end
-    
+
     def diff_full(obj1 = 'HEAD', obj2 = nil, opts = {})
       diff_opts = ['-p']
       diff_opts << obj1
@@ -350,7 +350,7 @@ module Git
 
       command('diff', diff_opts)
     end
-    
+
     def diff_stats(obj1 = 'HEAD', obj2 = nil, opts = {})
       diff_opts = ['--numstat']
       diff_opts << obj1
@@ -358,7 +358,7 @@ module Git
       diff_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
 
       hsh = {:total => {:insertions => 0, :deletions => 0, :lines => 0, :files => 0}, :files => {}}
-      
+
       command_lines('diff', diff_opts).each do |file|
         (insertions, deletions, filename) = file.split("\t")
         hsh[:total][:insertions] += insertions.to_i
@@ -367,20 +367,34 @@ module Git
         hsh[:total][:files] += 1
         hsh[:files][filename] = {:insertions => insertions.to_i, :deletions => deletions.to_i}
       end
-            
+
       hsh
     end
 
+    def diff_name_status(reference1 = nil, reference2 = nil, opts = {})
+      opts_arr = ['--name-status']
+      opts_arr << reference1 if reference1
+      opts_arr << reference2 if reference2
+
+      opts_arr << '--' << opts[:path] if opts[:path]
+
+      command_lines('diff', opts_arr).inject({}) do |memo, line|
+        status, path = line.split("\t")
+        memo[path] = status
+        memo
+      end
+    end
+
     # compares the index and the working directory
     def diff_files
       diff_as_hash('diff-files')
     end
-    
+
     # compares the index and the repository
     def diff_index(treeish)
       diff_as_hash('diff-index', treeish)
     end
-            
+
     def ls_files(location=nil)
       hsh = {}
       command_lines('ls-files', ['--stage', location]).each do |line|
@@ -436,12 +450,12 @@ module Git
     def global_config_get(name)
       command('config', ['--global', '--get', name], false)
     end
-    
+
     def config_list
       build_list = lambda do |path|
         parse_config_list command_lines('config', ['--list'])
       end
-      
+
       if @git_dir
         Dir.chdir(@git_dir, &build_list)
       else
@@ -452,7 +466,7 @@ module Git
     def global_config_list
       parse_config_list command_lines('config', ['--global', '--list'], false)
     end
-    
+
     def parse_config_list(lines)
       hsh = {}
       lines.each do |line|
@@ -475,12 +489,12 @@ module Git
       arr_opts = []
 
       arr_opts << (path ? "#{objectish}:#{path}" : objectish)
-      
+
       command('show', arr_opts.compact)
     end
-    
+
     ## WRITE COMMANDS ##
-        
+
     def config_set(name, value)
       command('config', [name, value])
     end
@@ -488,9 +502,9 @@ module Git
     def global_config_set(name, value)
       command('config', ['--global', name, value], false)
     end
-         
+
     # updates the repository index using the working directory content
-    # 
+    #
     #    lib.add('path/to/file')
     #    lib.add(['path/to/file1','path/to/file2'])
     #    lib.add(:all => true)
@@ -503,22 +517,23 @@ module Git
     # @param [Hash] options
     def add(paths='.',options={})
       arr_opts = []
-      
+
       arr_opts << '--all' if options[:all]
       arr_opts << '--force' if options[:force]
 
-      arr_opts << '--' 
+      arr_opts << '--'
 
       arr_opts << paths
-      
+
       arr_opts.flatten!
 
       command('add', arr_opts)
     end
-    
+
     def remove(path = '.', opts = {})
       arr_opts = ['-f']  # overrides the up-to-date check by default
       arr_opts << ['-r'] if opts[:recursive]
+      arr_opts << ['--cached'] if opts[:cached]
       arr_opts << '--'
       if path.is_a?(Array)
         arr_opts += path
@@ -533,10 +548,10 @@ module Git
       arr_opts = []
       arr_opts << "--message=#{message}" if message
       arr_opts << '--amend' << '--no-edit' if opts[:amend]
-      arr_opts << '--all' if opts[:add_all] || opts[:all] 
+      arr_opts << '--all' if opts[:add_all] || opts[:all]
       arr_opts << '--allow-empty' if opts[:allow_empty]
       arr_opts << "--author=#{opts[:author]}" if opts[:author]
-      
+
       command('commit', arr_opts)
     end
 
@@ -548,20 +563,20 @@ module Git
     end
 
     def clean(opts = {})
-      arr_opts = [] 
+      arr_opts = []
       arr_opts << '--force' if opts[:force]
       arr_opts << '-d' if opts[:d]
       arr_opts << '-x' if opts[:x]
 
       command('clean', arr_opts)
     end
-    
+
     def revert(commitish, opts = {})
       # Forcing --no-edit as default since it's not an interactive session.
       opts = {:no_edit => true}.merge(opts)
-      
+
       arr_opts = []
-      arr_opts << '--no-edit' if opts[:no_edit] 
+      arr_opts << '--no-edit' if opts[:no_edit]
       arr_opts << commitish
 
       command('revert', arr_opts)
@@ -572,13 +587,13 @@ module Git
       arr_opts << '--' << patch_file if patch_file
       command('apply', arr_opts)
     end
-    
+
     def apply_mail(patch_file)
       arr_opts = []
       arr_opts << '--' << patch_file if patch_file
       command('am', arr_opts)
     end
-    
+
     def stashes_all
       arr = []
       filename = File.join(@git_dir, 'logs/refs/stash')
@@ -590,7 +605,7 @@ module Git
       end
       arr
     end
-    
+
     def stash_save(message)
       output = command('stash save', ['--', message])
       output =~ /HEAD is now at/
@@ -603,29 +618,29 @@ module Git
         command('stash apply')
       end
     end
-    
+
     def stash_clear
       command('stash clear')
     end
-    
+
     def stash_list
       command('stash list')
     end
-    
+
     def branch_new(branch)
       command('branch', branch)
     end
-    
+
     def branch_delete(branch)
       command('branch', ['-D', branch])
     end
-    
+
     def checkout(branch, opts = {})
       arr_opts = []
       arr_opts << '-b' if opts[:new_branch] || opts[:b]
       arr_opts << '--force' if opts[:force] || opts[:f]
       arr_opts << branch
-      
+
       command('checkout', arr_opts)
     end
 
@@ -635,8 +650,8 @@ module Git
       arr_opts << file
       command('checkout', arr_opts)
     end
-    
-    def merge(branch, message = nil)      
+
+    def merge(branch, message = nil)
       arr_opts = []
       arr_opts << '-m' << message if message
       arr_opts += [branch]
@@ -654,10 +669,10 @@ module Git
     def conflicts # :yields: file, your, their
       self.unmerged.each do |f|
         your = Tempfile.new("YOUR-#{File.basename(f)}").path
-        command('show', ":2:#{f}", true, "> #{escape your}") 
+        command('show', ":2:#{f}", true, "> #{escape your}")
 
         their = Tempfile.new("THEIR-#{File.basename(f)}").path
-        command('show', ":3:#{f}", true, "> #{escape their}") 
+        command('show', ":3:#{f}", true, "> #{escape their}")
         yield(f, your, their)
       end
     end
@@ -669,14 +684,14 @@ module Git
       arr_opts << '--'
       arr_opts << name
       arr_opts << url
-      
+
       command('remote', arr_opts)
     end
-    
+
     def remote_remove(name)
       command('remote', ['rm', name])
     end
-    
+
     def remotes
       command_lines('remote')
     end
@@ -687,7 +702,7 @@ module Git
 
     def tag(name, *opts)
       target = opts[0].instance_of?(String) ? opts[0] : nil
-      
+
       opts = opts.last.instance_of?(Hash) ? opts.last : {}
 
       if (opts[:a] || opts[:annotate]) && !(opts[:m] || opts[:message])
@@ -703,11 +718,11 @@ module Git
       arr_opts << name
       arr_opts << target if target
       arr_opts << "-m #{opts[:m] || opts[:message]}" if opts[:m] || opts[:message]
-      
+
       command('tag', arr_opts)
     end
 
-    
+
     def fetch(remote, opts)
       arr_opts = [remote]
       arr_opts << '--tags' if opts[:t] || opts[:tags]
@@ -715,11 +730,11 @@ module Git
 
       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) 
-      
+      opts = {:tags => opts} if [true, false].include?(opts)
+
       arr_opts = []
       arr_opts << '--force'  if opts[:force] || opts[:f]
       arr_opts << remote
@@ -735,18 +750,18 @@ module Git
     def tag_sha(tag_name)
       head = File.join(@git_dir, 'refs', 'tags', tag_name)
       return File.read(head).chomp if File.exist?(head)
-      
+
       command('show-ref',  ['--tags', '-s', tag_name])
-    end  
-    
+    end
+
     def repack
       command('repack', ['-a', '-d'])
     end
-    
+
     def gc
       command('gc', ['--prune', '--aggressive', '--auto'])
     end
-    
+
     # reads a tree into the current index file
     def read_tree(treeish, opts = {})
       arr_opts = []
@@ -754,28 +769,28 @@ module Git
       arr_opts += [treeish]
       command('read-tree', arr_opts)
     end
-    
+
     def write_tree
       command('write-tree')
     end
-    
+
     def commit_tree(tree, opts = {})
       opts[:message] ||= "commit tree #{tree}"
       t = Tempfile.new('commit-message')
       t.write(opts[:message])
       t.close
-      
+
       arr_opts = []
       arr_opts << tree
       arr_opts << '-p' << opts[:parent] if opts[:parent]
       arr_opts += [opts[:parents]].map { |p| ['-p', p] }.flatten if opts[:parents]
       command('commit-tree', arr_opts, true, "< #{escape t.path}")
     end
-    
+
     def update_ref(branch, commit)
       command('update-ref', [branch, commit])
     end
-    
+
     def checkout_index(opts = {})
       arr_opts = []
       arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
@@ -785,7 +800,7 @@ module Git
 
       command('checkout-index', arr_opts)
     end
-    
+
     # creates an archive file
     #
     # options
@@ -795,12 +810,12 @@ module Git
     #  :path
     def archive(sha, file = nil, opts = {})
       opts[:format] ||= 'zip'
-      
+
       if opts[:format] == 'tgz'
-        opts[:format] = 'tar' 
+        opts[:format] = 'tar'
         opts[:add_gzip] = true
       end
-      
+
       if !file
         tempfile = Tempfile.new('archive')
         file = tempfile.path
@@ -839,13 +854,18 @@ module Git
 
     # Systen ENV variables involved in the git commands.
     #
-    # @return [<String>] the names of the EVN variables involved in the git commands 
+    # @return [<String>] the names of the EVN variables involved in the git commands
     ENV_VARIABLE_NAMES = ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE', 'GIT_SSH']
-    
+
     def command_lines(cmd, opts = [], chdir = true, redirect = '')
-      command(cmd, opts, chdir).split("\n")
+      cmd_op = command(cmd, opts, chdir)
+      op = cmd_op.encode("UTF-8", "binary", {
+	  	:invalid => :replace,
+		:undef => :replace
+	  })
+      op.split("\n")
     end
-    
+
     # Takes the current git's system ENV variables and store them.
     def store_git_system_env_variables
       @git_system_env_variables = {}
@@ -857,7 +877,7 @@ module Git
     # Takes the previously stored git's ENV variables and set them again on ENV.
     def restore_git_system_env_variables
       ENV_VARIABLE_NAMES.each do |env_variable_name|
-        ENV[env_variable_name] = @git_system_env_variables[env_variable_name] 
+        ENV[env_variable_name] = @git_system_env_variables[env_variable_name]
       end
     end
 
@@ -882,26 +902,26 @@ module Git
     ensure
       restore_git_system_env_variables()
     end
-    
+
     def command(cmd, opts = [], chdir = true, redirect = '', &block)
       global_opts = []
       global_opts << "--git-dir=#{@git_dir}" if !@git_dir.nil?
       global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil?
-      
+
       opts = [opts].flatten.map {|s| escape(s) }.join(' ')
-      
+
       global_opts = global_opts.flatten.map {|s| escape(s) }.join(' ')
-      
+
       git_cmd = "#{Git::Base.config.binary_path} #{global_opts} #{cmd} #{opts} #{redirect} 2>&1"
-      
+
       output = nil
-      
-      command_thread = nil; 
-      
+
+      command_thread = nil;
+
       exitstatus = nil
 
       with_custom_env_variables do
-        command_thread = Thread.new do 
+        command_thread = Thread.new do
           output = run_command(git_cmd, &block)
           exitstatus = $?.exitstatus
         end
@@ -912,9 +932,9 @@ module Git
         @logger.info(git_cmd)
         @logger.debug(output)
       end
-            
+
       if exitstatus > 1 || (exitstatus == 1 && output != '')
-        raise Git::GitExecuteError.new(git_cmd + ':' + output.to_s) 
+        raise Git::GitExecuteError.new(git_cmd + ':' + output.to_s)
       end
 
       return output
@@ -929,21 +949,21 @@ module Git
       command_lines(diff_command, opts).inject({}) do |memo, line|
         info, file = line.split("\t")
         mode_src, mode_dest, sha_src, sha_dest, type = info.split
-        
+
         memo[file] = {
-          :mode_index => mode_dest, 
-          :mode_repo => mode_src.to_s[1, 7], 
-          :path => file, 
-          :sha_repo => sha_src, 
-          :sha_index => sha_dest, 
+          :mode_index => mode_dest,
+          :mode_repo => mode_src.to_s[1, 7],
+          :path => file,
+          :sha_repo => sha_src,
+          :sha_index => sha_dest,
           :type => type
         }
 
         memo
       end
     end
-    
-    # Returns an array holding the common options for the log commands 
+
+    # Returns an array holding the common options for the log commands
     #
     # @param [Hash] opts the given options
     # @return [Array] the set of common options that the log command will use
@@ -960,28 +980,28 @@ module Git
 
       arr_opts
     end
-    
+
     # Retrurns an array holding path options for the log commands
     #
     # @param [Hash] opts the given options
     # @return [Array] the set of path options that the log command will use
     def log_path_options(opts)
       arr_opts = []
-     
+
       arr_opts << opts[:object] if opts[:object].is_a? String
       arr_opts << '--' << opts[:path_limiter] if opts[:path_limiter]
       arr_opts
     end
-    
+
     def run_command(git_cmd, &block)
       return IO.popen(git_cmd, &block) if block_given?
-      
+
       `#{git_cmd}`.chomp
     end
 
     def escape(s)
       return "'#{s && s.to_s.gsub('\'','\'"\'"\'')}'" if RUBY_PLATFORM !~ /mingw|mswin/
-      
+
       # Keeping the old escape format for windows users
       escaped = s.to_s.gsub('\'', '\'\\\'\'')
       return %Q{"#{escaped}"}

data/lib/git/version.rb

@@ -2,6 +2,6 @@ module Git
 
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.2.9'
+  VERSION='1.3.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.2.9.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - git 1.6.0.0, or greater
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby/Git is a Ruby library that can be used to create, read and manipulate