Allow disabling chomping of #command output

smortex · smortex · commit 44aa20912372 · 2018-08-03T11:59:29.000+02:00
This allows the #show method to return the actual content of a file when
this file ends by a line feed.

Signed-off-by: Romain Tartière &lt;romain@blogreen.org&gt;
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -495,7 +495,7 @@ def show(objectish=nil, path=nil)
 
       arr_opts << (path ? "#{objectish}:#{path}" : objectish)
 
-      command('show', arr_opts.compact)
+      command('show', arr_opts.compact, chomp: false)
     end
 
     ## WRITE COMMANDS ##
@@ -934,12 +934,12 @@ def with_custom_env_variables(&block)
     end
 
     def command(cmd, *opts, &block)
-      command_opts = { redirect: '' }
+      command_opts = { chomp: true, redirect: '' }
       if opts.last.is_a?(Hash)
         command_opts.merge!(opts.pop)
       end
       command_opts.keys.each do |k|
-        raise ArgumentError.new("Unsupported option: #{k}") unless [:redirect].include?(k)
+        raise ArgumentError.new("Unsupported option: #{k}") unless [:chomp, :redirect].include?(k)
       end
 
       default_command_opts = { redirect: '' }
@@ -978,6 +978,10 @@ def command(cmd, *opts, &block)
         raise Git::GitExecuteError.new(git_cmd + ':' + output.to_s)
       end
 
+      if command_opts[:chomp]
+        output.chomp! if output
+      end
+
       return output
     end
 
@@ -1037,7 +1041,7 @@ def log_path_options(opts)
     def run_command(git_cmd, &block)
       return IO.popen(git_cmd, &block) if block_given?
 
-      `#{git_cmd}`.chomp
+      `#{git_cmd}`
     end
 
     def escape(s)
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -239,6 +239,7 @@ def test_show
     assert(/^commit 5e53019b3238362144c2766f02a2c00d91fcc023.+\+replace with new text - diff test$/m.match(@lib.show))
     assert(/^commit 935badc874edd62a8629aaf103418092c73f0a56.+\+nothing!$/m.match(@lib.show('gitsearch1')))
     assert(/^hello.+nothing!$/m.match(@lib.show('gitsearch1', 'scott/text.txt')))
+    assert(@lib.show('gitsearch1', 'scott/text.txt') == "hello\nthis is\na file\nthat is\nput here\nto search one\nto search two\nnothing!\n")
   end
   
 end
