git 1.5.0 → 1.6.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d44aad4d6c430e5e224d27ddfece08f6a5696c068dbe041df3bd740ae94d7a
-  data.tar.gz: d7ac8d85b906620006cb5c1fc9206d6f406115490b88fedc7fb8aebe4a8302c9
+  metadata.gz: 291adaa24da09656259518cf50d18882222a6704c742f70d266378a7c4d440cc
+  data.tar.gz: 46639fb4a5542f2354d9713dd47adca9349fda39a8b0a6a1d739e830214a1c05
 SHA512:
-  metadata.gz: 19d5093d80ee3a4af8c6ceb27185464378a715330de92893cd81ece19a71986e29f7631c389b7204eb2bb4a47b0dcc8ce56f3a90164a6f2a22b696d53c6e8179
-  data.tar.gz: 29895e438fec3de810e1b3f78bf2c177b04081a72fdfad72a3e231ee3737df23e6cbebb58678a81c9883bcbb05b29058bee9c4c6189dcdac21249e8ac5bd0959
+  metadata.gz: 3bd0c914126e45b381671af36637e226817f7894164344c3abed242e3ba34a414290a9adceff25e7cc931be89192d17fe2510945d4391ffd35e994c79f71dab0
+  data.tar.gz: e249b429712dd287389f13d59e09c344e372b6d77189fa3baf1b81b63126f93e8f71c752b90c0f1227aa5d374efed4ee5aa572aca55832276c13ed1e86ddaee7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.6.0.pre1
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0.pre1
+
 ## 1.5.0
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.5.0

data/README.md

@@ -66,9 +66,9 @@ Git env config
     # If you need to use a custom SSH script
     config.git_ssh = '/path/to/ssh/script'
   end
-
 ```
 
+_NOTE: Another way to specify where is the `git` binary is through the environment variable `GIT_PATH`_
 
 Here are the operations that need read permission only.
 
@@ -216,6 +216,8 @@ And here are the operations that will need to write to your git repository.
      g.merge(g.branch('master'))
      g.merge([branch1, branch2])
 
+     g.merge_base('branch1', 'branch2')
+
      r = g.add_remote(name, uri)  # Git::Remote
      r = g.add_remote(name, Git::Base)  # Git::Remote
 

data/lib/git/base/factory.rb

@@ -68,6 +68,14 @@ module Git
         Git::Object.new(self, tag_name, 'tag', true)
       end
 
+      # Find as good common ancestors as possible for a merge
+      # example: g.merge_base('master', 'some_branch', 'some_sha', octopus: true)
+      # returns Array<Git::Object::Commit>
+      def merge_base(*args)
+        shas = self.lib.merge_base(*args)
+        shas.map { |sha| gcommit(sha) }
+      end
+
     end
 
   end

data/lib/git/config.rb

@@ -10,7 +10,7 @@ module Git
     end
 
     def binary_path
-      @binary_path || 'git'
+      @binary_path || ENV['GIT_PATH'] && File.join(ENV['GIT_PATH'], 'git') || 'git'
     end
 
     def git_ssh

data/lib/git/diff.rb

@@ -127,12 +127,7 @@ module Git
         }
         final = {}
         current_file = nil
-        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|
+        @full_diff.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})

data/lib/git/lib.rb

@@ -1,3 +1,4 @@
+require 'rchardet'
 require 'tempfile'
 
 module Git
@@ -666,6 +667,21 @@ module Git
       command('merge', arr_opts)
     end
 
+    def merge_base(*args)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+
+      arg_opts = []
+
+      arg_opts << '--octopus' if opts[:octopus]
+      arg_opts << '--independent' if opts[:independent]
+      arg_opts << '--fork-point' if opts[:fork_point]
+      arg_opts << '--all' if opts[:all]
+
+      arg_opts += args
+
+      command('merge-base', arg_opts).lines.map(&:strip)
+    end
+
     def unmerged
       unmerged = []
       command_lines('diff', ["--cached"]).each do |line|
@@ -747,6 +763,7 @@ module Git
       arr_opts << opts[:ref] if opts[:ref]
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
+      arr_opts << '--unshallow' if opts[:unshallow]
 
       command('fetch', arr_opts)
     end
@@ -884,16 +901,7 @@ module Git
     ENV_VARIABLE_NAMES = ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE', 'GIT_SSH']
 
     def command_lines(cmd, opts = [], chdir = true, redirect = '')
-      cmd_op = command(cmd, opts, chdir)
-      if cmd_op.encoding.name != "UTF-8"
-        op = cmd_op.encode("UTF-8", "binary", {
-          :invalid => :replace,
-          :undef => :replace
-        })
-      else
-        op = cmd_op
-      end
-      op.split("\n")
+      command(cmd, opts, chdir).lines.map(&:chomp)
     end
 
     # Takes the current git's system ENV variables and store them.
@@ -1023,10 +1031,35 @@ module Git
       arr_opts
     end
 
+    def default_encoding
+      __ENCODING__.name
+    end
+
+    def best_guess_encoding
+      # Encoding::ASCII_8BIT.name
+      Encoding::UTF_8.name
+    end
+
+    def detected_encoding(str)
+      CharDet.detect(str)['encoding'] || best_guess_encoding
+    end
+
+    def encoding_options
+      { invalid: :replace, undef: :replace }
+    end
+
+    def normalize_encoding(str)
+      return str if str.valid_encoding? && str.encoding == default_encoding
+
+      return str.encode(default_encoding, str.encoding, encoding_options) if str.valid_encoding?
+
+      str.encode(default_encoding, detected_encoding(str), encoding_options)
+    end
+
     def run_command(git_cmd, &block)
       return IO.popen(git_cmd, &block) if block_given?
 
-      `#{git_cmd}`.chomp
+      `#{git_cmd}`.chomp.lines.map { |l| normalize_encoding(l) }.join
     end
 
     def escape(s)

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.5.0'
+  VERSION='1.6.0.pre1'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0.pre1
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rchardet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby/Git is a Ruby library that can be used to create, read and manipulate