gitlab_git 7.2.9 → 7.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093a48bc5387399df0b770442205dbc5d782f840
-  data.tar.gz: 9bbc121aad494a63764ff35f97332fce368883b6
+  metadata.gz: d1290b38048656f160076eb75a8a63da82bae5f1
+  data.tar.gz: 1c25bce20c683335d52a6ea10b6e53c3098c69fe
 SHA512:
-  metadata.gz: c655e5aa4856d822a7b5e46b12efa7da8494226edeee121c8622148d7c239f262c8e95ead052fc159b20e5be210a24519c5b791ca717322aada3d8923399d19e
-  data.tar.gz: 276b8610c80c368daedb4f793311fc86564eb64b5f916d8f7b251b9635a4799e1d87ddfb9a8073db75d5c45ee58a67262e4e8d675bb152fa8be2dd37a8e4ab0e
+  metadata.gz: eed11049f16e49ed1ffdf8aab4bbfe2798fc7dccb4b1a5838eb587c74c7d3ee59c15549a7d52a566856f200b1fba7ca0bcf1809068e3d2a6a676ff9cb174de30
+  data.tar.gz: c34ff60bb71241ebbc42426ec81663826d91ff9969b06d9ad65ce985e8c0fac51c48ff618e4e4862de45dfd50741f0feb762b5bb89010d8f4dc042bf5f90a504

data/VERSION

@@ -1 +1 @@
-7.2.9
+7.2.10

data/lib/gitlab_git/blob.rb

@@ -127,10 +127,13 @@ module Gitlab
             index.remove(file[:path])
           else
             content = file[:content]
+            detect = CharlockHolmes::EncodingDetector.new.detect(content) if content
 
-            # When writing to the repo directly as we are doing here, 
-            # the `core.autocrlf` config isn't taken into account.
-            content.gsub!("\r\n", "\n") if repository.autocrlf
+            unless detect && detect[:type] == :binary
+              # When writing to the repo directly as we are doing here,
+              # the `core.autocrlf` config isn't taken into account.
+              content.gsub!("\r\n", "\n") if repository.autocrlf
+            end
 
             oid = repo.write(content, :blob)
             index.add(path: file[:path], oid: oid, mode: 0100644)

data/lib/gitlab_git/repository.rb

@@ -280,18 +280,19 @@ module Gitlab
         sha = sha_from_ref(actual_ref)
         repo = options[:repo]
 
-        cmd = %W(git -C #{path} log)
-        cmd << %W(-n #{options[:limit].to_i})
-        cmd << %W(--skip=#{options[:offset].to_i})
-        cmd << %W(--follow) if options[:follow]
-        cmd << %W(--no-merges) if options[:skip_merges]
-        cmd << sha
-        cmd << %W(-- #{options[:path]}) if options[:path]
-
-        raw_output = IO.popen(cmd.flatten) {|io| io.read }
-
-        log = raw_output.scan(/commit\ ([0-9a-f]{40})/).flatten.map do |c|
-          Rugged::Commit.new(rugged, c)
+        cmd = %W(git --git-dir=#{path} log)
+        cmd += %W(-n #{options[:limit].to_i})
+        cmd += %W(--format=%H)
+        cmd += %W(--skip=#{options[:offset].to_i})
+        cmd += %W(--follow) if options[:follow]
+        cmd += %W(--no-merges) if options[:skip_merges]
+        cmd += [sha]
+        cmd += %W(-- #{options[:path]}) if options[:path]
+
+        raw_output = IO.popen(cmd) {|io| io.read }
+
+        log = raw_output.lines.map do |c|
+          Rugged::Commit.new(rugged, c.strip)
         end
 
         log.is_a?(Array) ? log : []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.9
+  version: 7.2.10
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library