Reimplement environment variable, use GIT_PATH

Salim Afiune · Salim Afiune · commit cab28f2b7580 · 2019-09-08T16:54:24.000-06:00
Instead of using `GIT_BINARY` we prefare the environment variable
`GIT_PATH`

Signed-off-by: Salim Afiune &lt;afiune@chef.io&gt;
diff --git a/README.md b/README.md
@@ -66,11 +66,9 @@ Git env config
     # If you need to use a custom SSH script
     config.git_ssh = '/path/to/ssh/script'
   end
-
 ```
 
-_NOTE: Another way to specify where is the `git` binary is through the environment variable `GIT_BINARY`_
-
+_NOTE: Another way to specify where is the `git` binary is through the environment variable `GIT_PATH`_
 
 Here are the operations that need read permission only.
 
diff --git a/lib/git/config.rb b/lib/git/config.rb
@@ -10,7 +10,7 @@ def initialize
     end
 
     def binary_path
-      @binary_path || ENV['GIT_BINARY'] || 'git'
+      @binary_path || ENV['GIT_PATH'] && File.join(ENV['GIT_PATH'], 'git') || 'git'
     end
 
     def git_ssh
diff --git a/tests/units/test_config.rb b/tests/units/test_config.rb
@@ -34,7 +34,7 @@ def test_env_config
         assert_equal(Git::Base.config.binary_path, 'git')
         assert_equal(Git::Base.config.git_ssh, nil)
 
-        ENV['GIT_BINARY'] = '/env/bin/git'
+        ENV['GIT_PATH'] = '/env/bin'
         ENV['GIT_SSH'] = '/env/git/ssh'
 
         assert_equal(Git::Base.config.binary_path, '/env/bin/git')
@@ -51,7 +51,7 @@ def test_env_config
         @git.log
       ensure
         ENV['GIT_SSH'] = nil
-        ENV['GIT_BINARY'] = nil
+        ENV['GIT_PATH'] = nil
 
         Git.configure do |config|
           config.binary_path = nil
