Lib: Return the archive contents instead of writing to a temporary file

tdawes · tdawes · commit 42b2abd99e8c · 2018-01-31T16:27:58.000Z
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -836,22 +836,19 @@ def archive(sha, file = nil, opts = {})
         opts[:add_gzip] = true
       end
 
-      if !file
-        tempfile = Tempfile.new('archive')
-        file = tempfile.path
-        # delete it now, before we write to it, so that Ruby doesn't delete it
-        # when it finalizes the Tempfile.
-        tempfile.close!
-      end
-
       arr_opts = []
       arr_opts << "--format=#{opts[:format]}" if opts[:format]
       arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
       arr_opts << "--remote=#{opts[:remote]}" if opts[:remote]
       arr_opts << sha
       arr_opts << '--' << opts[:path] if opts[:path]
-      command('archive', arr_opts, true, (opts[:add_gzip] ? '| gzip' : '') + " > #{escape file}")
-      return file
+
+      if file
+        command('archive', arr_opts, true, (opts[:add_gzip] ? '| gzip' : '') + " > #{escape file}")
+        return file
+      else
+        command('archive', arr_opts, true, (opts[:add_gzip] ? '| gzip' : ''))
+      end
     end
 
     # returns the current version of git, as an Array of Fixnums.
