Remove extraneous '--' from git stash save -- message

terceiro · web-flow · commit 2b9629d6066a · 2020-04-05T13:06:53.000-07:00
* Fix warning under ruby 2.7

Signed-off-by: Antonio Terceiro &lt;asa@terceiro.xyz&gt;

* Git::Lib: fix stash_save for git 2.25+

On git 2.20, that '--' gets ignored, but on newer versions, at least
from git 2.25+, it gets into the stash message.

Signed-off-by: Antonio Terceiro &lt;asa@terceiro.xyz&gt;

* test_helper: drop unecessary relative reference to lib/

Rakefile loads git.gemspec which already adds lib/ to the $LOAD_PATH.
This also makes it possible to run the tests against the library
installed system-wide.

Signed-off-by: Antonio Terceiro &lt;asa@terceiro.xyz&gt;
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -616,7 +616,7 @@ def stashes_all
     end
 
     def stash_save(message)
-      output = command('stash save', ['--', message])
+      output = command('stash save', [message])
       output =~ /HEAD is now at/
     end
 
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
@@ -3,7 +3,7 @@
 require 'logger'
 require 'test/unit'
 
-require "#{File.expand_path(File.dirname(__FILE__))}/../lib/git"
+require "git"
 
 class Test::Unit::TestCase
   
