Preventing Git::Config.git_ssh from overwriting the previously set GIT_SSH env value unless a custom value is set via Git.configure

robertodecurnex · robertodecurnex · commit 47051ed1154d · 2015-01-13T23:27:48.000-03:00
closes ruby-git#212
diff --git a/lib/git/config.rb b/lib/git/config.rb
@@ -2,18 +2,21 @@ module Git
 
   class Config
 
-    attr_writer :binary_path
-
-    attr_accessor :git_ssh
+    attr_writer :binary_path, :git_ssh
 
     def initialize
       @binary_path = nil
+      @git_ssh = nil
     end
 
     def binary_path
       @binary_path || 'git'
     end
 
+    def git_ssh
+      @git_ssh || ENV['GIT_SSH']
+    end
+
   end
 
 end
diff --git a/tests/units/test_config.rb b/tests/units/test_config.rb
@@ -29,13 +29,23 @@ def test_set_config
   end  
 
   def test_env_config
+    assert_equal(Git::Base.config.git_ssh, nil)
+    
+    ENV['GIT_SSH'] = '/env/git/ssh'
+
+    assert_equal(Git::Base.config.git_ssh, '/env/git/ssh')
+
     Git.configure do |config|
-      config.binary_path = "/usr/bin/git"
-      config.git_ssh = "/path/to/ssh/script"
+      config.binary_path = '/usr/bin/git'
+      config.git_ssh = '/path/to/ssh/script'
     end
+    
+    assert_equal(Git::Base.config.git_ssh, '/path/to/ssh/script')
 
     @git.log
   ensure
+    ENV['GIT_SSH'] = nil
+
     Git.configure do |config|
       config.binary_path = nil
       config.git_ssh = nil
