gitlab-grit 2.6.9 → 2.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91628dfa7d6ccd4bdf412c0c38315137910bfc89
-  data.tar.gz: 000bd780528b454afe3eca1e92ba94ae82c13513
+  metadata.gz: cc0703262bb7ef4d6c8b89f043540bca37883db1
+  data.tar.gz: 3dbb330aa2501a0e99adcb6a3ceec5b24434f8f2
 SHA512:
-  metadata.gz: 83b5a66fbdaa910c62f8dc31bd3f53ad8735a95b596a5f74d711b501d60cf04c1ac96dd3afbf3474b681af47abf309c4c48a7d38e5aa0d6288d33b1b6a4bb50a
-  data.tar.gz: 109ddf8ab210e7e3b00167273324046572bfe31821a1fd86df9918697a86f58ebcb6dfe187b1a9adc005ba091b5bcc7d4701c1850ef76c77af7389ae1ad54f59
+  metadata.gz: b6bbe550adc711e01b2bbd0ae76d99f6de7647fcbad4614bf817fe9c48035ea32d881abae7751d77f3815e8672b6727898e0041b3821805b6501d0dd84193d31
+  data.tar.gz: 32bb2bf904b9948b38e2a8feaee05fc03d5f99904e43d738f0d43f696ae331ffe0b38cb3c173fa83b87abf1377e6094d4ac31ebcc12abc5a3d7a319f1ba1e8b3

data/README.md

@@ -21,6 +21,8 @@ We patched existing grit library to use it inside GitLab
 * Fixes symlinks omission from diff
 * Added Gemfile
 * Ruby 2.0 support
+* Automatically set the `--work-tree=` option for Git
+* Remove `chdir:` option from Grit::Git#native
 * and much more small fixes
 
 

data/VERSION

@@ -1 +1 @@
-2.6.9
+2.6.10

data/lib/grit/git.rb

@@ -93,9 +93,9 @@ module Grit
 
     attr_accessor :git_dir, :bytes_read, :work_tree
 
-    def initialize(git_dir)
+    def initialize(git_dir, options={})
       self.git_dir    = git_dir
-      self.work_tree  = git_dir.gsub(/\/\.git$/,'')
+      self.work_tree  = options[:work_tree]
       self.bytes_read = 0
     end
 
@@ -320,12 +320,12 @@ module Grit
       input    = options.delete(:input)
       timeout  = options.delete(:timeout); timeout = true if timeout.nil?
       base     = options.delete(:base);    base    = true if base.nil?
-      chdir    = options.delete(:chdir)
 
       # build up the git process argv
       argv = []
       argv << Git.git_binary
       argv << "--git-dir=#{git_dir}" if base
+      argv << "--work-tree=#{work_tree}" if work_tree
       argv << cmd.to_s.tr('_', '-')
       argv.concat(options_to_argv(options))
       argv.concat(args)
@@ -336,7 +336,6 @@ module Grit
       process =
         Child.new(env, *(argv + [{
           :input   => input,
-          :chdir   => chdir,
           :timeout => (Grit::Git.git_timeout if timeout == true),
           :max     => (Grit::Git.git_max_size if timeout == true)
         }]))

data/lib/grit/repo.rb

@@ -54,7 +54,7 @@ module Grit
         raise NoSuchPathError.new(epath)
       end
 
-      self.git = Git.new(self.path)
+      self.git = Git.new(self.path, work_tree: self.working_dir)
     end
 
     # Public: Initialize a git repository (create it on the filesystem). By

data/lib/grit/status.rb

@@ -116,7 +116,7 @@ module Grit
       # compares the index and the working directory
       def diff_files
         hsh = {}
-        @base.git.diff_files(chdir: @base.working_dir).split("\n").each do |line|
+        @base.git.diff_files({}).split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
           hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest,
@@ -128,7 +128,7 @@ module Grit
       # compares the index and the repository
       def diff_index(treeish)
         hsh = {}
-        @base.git.diff_index({chdir: @base.working_dir}, treeish).split("\n").each do |line|
+        @base.git.diff_index({}, treeish).split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
           hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest,
@@ -139,7 +139,7 @@ module Grit
 
       def ls_files
         hsh = {}
-        lines = @base.git.ls_files({chdir: @base.working_dir, :stage => true})
+        lines = @base.git.ls_files({:stage => true})
         lines.split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode, sha, stage) = info.split

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.6.10
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes