Merge branch 'master' into encoding_comparison_fix

jcouball · web-flow · commit 4f74627b0570 · 2020-04-05T13:08:55.000-07:00
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
   
