preserve former git environment variables

mwrock · othatbrian · commit 304365543230 · 2014-12-07T19:06:54.000-06:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -734,6 +734,10 @@ def command_lines(cmd, opts = [], chdir = true, redirect = '')
     end
     
     def command(cmd, opts = [], chdir = true, redirect = '', &block)
+      old_git_dir = ENV['GIT_DIR']
+      old_git_work_dir = ENV['GIT_WORK_TREE']
+      old_git_index_file = ENV['GIT_INDEX_FILE']
+
       ENV['GIT_DIR'] = @git_dir
       ENV['GIT_WORK_TREE'] = @git_work_dir
       ENV['GIT_INDEX_FILE'] = @git_index_file
@@ -762,6 +766,10 @@ def command(cmd, opts = [], chdir = true, redirect = '', &block)
       end
 
       return output
+    ensure
+      ENV['GIT_DIR'] = old_git_dir
+      ENV['GIT_WORK_TREE'] = old_git_work_dir
+      ENV['GIT_INDEX_FILE'] = old_git_index_file
     end
 
     # Takes the diff command line output (as Array) and parse it into a Hash
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -49,6 +49,18 @@ def test_log_commits
     assert_equal(20, a.size)
   end
   
+  def test_environment_reset
+    ENV['GIT_DIR'] = '/my/git/dir'
+    ENV['GIT_WORK_TREE'] = '/my/work/tree'
+    ENV['GIT_INDEX_FILE'] = 'my_index'
+
+    @lib.log_commits :count => 10
+
+    assert_equal(ENV['GIT_DIR'], '/my/git/dir')
+    assert_equal(ENV['GIT_WORK_TREE'], '/my/work/tree')
+    assert_equal(ENV['GIT_INDEX_FILE'],'my_index')
+  end
+
   def test_revparse
     assert_equal('1cc8667014381e2788a94777532a788307f38d26', @lib.revparse('1cc8667014381')) # commit
     assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @lib.revparse('1cc8667014381^{tree}')) #tree
