gitlab_git 7.0.0.rc6 → 7.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7d2598502ec97b5d9a828685aa35f54b885ae5
-  data.tar.gz: cbcc3b9da0a7d2cc30a7ab9c6c009e0df68fb6bd
+  metadata.gz: a017d97f4752bc24ff9fc7abe49b9fc0143301a9
+  data.tar.gz: c5bc10d54d6c635549c0d04a5cd71e29bf272247
 SHA512:
-  metadata.gz: 761f437cb30cd9a4870ecf65c350da50d06b865252abc637730374246c7b21f5f0239737b463dd4d0461748092601b89a4952b4b4b36cf9055981d966433a935
-  data.tar.gz: 12ec8756f8308c393b2395b9c8bc6c938cce6b0b51e9330e59964186f721c45f4eb9377af0d5a1524965b99e528601a80fa746b2025cfeb05e4113fd2b530dfe
+  metadata.gz: 84a528cad4b97c3e8ec7e177e59830b51eab8963d44eb491c09069cfa130cd62b3fb19df8ee1fb2cce5add69d452f891906bd1f8fe732ebc999de01d92276ba3
+  data.tar.gz: db2d09da3da1c07af108da6ee783f39b298408351e9161d697864b01d66a799443acd6b106489bf772e1b192036778c358d090bd892e611ada5146305b4fb908

data/VERSION

@@ -1 +1 @@
-7.0.0.rc6
+7.0.0.rc7

data/lib/gitlab_git/repository.rb

@@ -825,29 +825,32 @@ module Gitlab
         if extension == '.zip'
           create_zip_archive(ref_name, file_path, prefix)
         else
-          rd_pipe, rw_pipe = IO.pipe
-          tar_pid = fork do
-            # Send the tar file to the write pipe
-            rd_pipe.close
-            Gem::Package::TarWriter.new(rw_pipe) do |tar|
-              tar.mkdir(prefix, 33261)
-
-              populated_index(ref_name).each do |entry|
-                add_archive_entry(tar, prefix, entry)
-              end
-            end
-            rw_pipe.close
-          end
-
-          # Use the other end of the pipe to compress with bzip2 or gzip
+          # Open the file with the final result
           FileUtils.mkdir_p(Pathname.new(file_path).dirname)
           archive_file = File.new(file_path, 'wb')
-          rw_pipe.close
-          system(*pipe_cmd, in: rd_pipe, out: archive_file)
 
-          Process.waitpid(tar_pid)
-          rd_pipe.close
+          # Create a pipe to communicate with the compressor process
+          pipe_rd, pipe_wr = IO.pipe
+          compress_pid = spawn(*pipe_cmd, in: pipe_rd, out: archive_file)
+          # pipe_rd and archive_file belong to the compressor process now; close
+          # them straightaway in our process.
+          pipe_rd.close
           archive_file.close
+
+          # Change the external encoding of pipe_wr to prevent Ruby from trying
+          # to convert binary to UTF-8.
+          pipe_wr = IO.new(pipe_wr.fileno, 'w:ASCII-8BIT')
+          Gem::Package::TarWriter.new(pipe_wr) do |tar|
+            tar.mkdir(prefix, 33261)
+
+            populated_index(ref_name).each do |entry|
+              add_archive_entry(tar, prefix, entry)
+            end
+          end
+          # We are done with pipe_wr, close it straightaway.
+          pipe_wr.close
+
+          Process.waitpid(compress_pid)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc6
+  version: 7.0.0.rc7
 platform: ruby
 authors:
 - Dmitriy Zaporozhets