gitlab-grit 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af275c881c0a7a0f9b5bd97093b3817ed9208a7b
-  data.tar.gz: a8a61cbffd8d271e4dcb03e5ba096aad81620c77
+  metadata.gz: 51dd36ad6344dca95142a1b1aad17b57fb215332
+  data.tar.gz: 6f61c249d2f98c60da293ab78a5202b69544039c
 SHA512:
-  metadata.gz: 20070e9bea6fb2278b24b48574f12a6101363feadef525eb80058a57700753f0108b8db66849ca8fbd1b5484581758174595a2138f6a13cb347f53b02d00ce55
-  data.tar.gz: 65ff74cd753406728149809b196ff2fe2e281d4539f7c533d1054e5aa43098b6c3373a80055bee588e3ad918bda2642b9bf3165b7a05818f46a9384c0d106933
+  metadata.gz: 1bbd77f134862fcc323a21eaf15821e088011210c4c74e514429311bbe1642c7a3b75f9eeb8e19be7c71dfce694f6db6b41787037960f68c21cb00ebada28a22
+  data.tar.gz: 939277d6a7f2f010ca0c34f7c7ca7e40c71868bfa099c687fe225e30bec380809acd67bd04e1f17f76b1a0cdfd4fedda3697dd2aecfd873ed0dd52ed0364b9de

data/lib/grit/git-ruby/git_object.rb

@@ -125,6 +125,11 @@ module Grit
       end
     end
 
+    # Filenames can have weird characters that throw grit's text parsing
+    def safe_name
+      name.gsub(/[\r\n\0]/, '')
+    end
+
     def type
       case @mode & S_IFMT
       when S_IFGITLINK
@@ -223,7 +228,7 @@ module Grit
     def raw_content
       # TODO: sort correctly
       #@entry.sort { |a,b| a.name <=> b.name }.
-      @entry.collect { |e| [[e.format_mode, e.format_type, e.sha1].join(' '), e.name].join("\t") }.join("\n")
+      @entry.collect { |e| [[e.format_mode, e.format_type, e.sha1].join(' '), e.safe_name].join("\t") }.join("\n")
     end
 
     def actual_raw

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes