Do not change ENV variables of a current process

fxposter · fxposter · commit ca869feea026 · 2023-10-26T00:50:59.000+03:00
Instead pass relevant environment to the actual shell command being run

Signed-off-by: Pavel Forkert &lt;fxposter@gmail.com&gt;
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -6,8 +6,6 @@
 module Git
   class Lib
 
-    @@semaphore = Mutex.new
-
     # The path to the Git working copy.  The default is '"./.git"'.
     #
     # @return [Pathname] the path to the Git working copy.
@@ -1142,41 +1140,14 @@ def command_lines(cmd, *opts, chdir: nil)
       op.split("\n")
     end
 
-    # Takes the current git's system ENV variables and store them.
-    def store_git_system_env_variables
-      @git_system_env_variables = {}
-      ENV_VARIABLE_NAMES.each do |env_variable_name|
-        @git_system_env_variables[env_variable_name] = ENV[env_variable_name]
-      end
-    end
-
-    # Takes the previously stored git's ENV variables and set them again on ENV.
-    def restore_git_system_env_variables
-      ENV_VARIABLE_NAMES.each do |env_variable_name|
-        ENV[env_variable_name] = @git_system_env_variables[env_variable_name]
-      end
-    end
-
-    # Sets git's ENV variables to the custom values for the current instance.
-    def set_custom_git_env_variables
-      ENV['GIT_DIR'] = @git_dir
-      ENV['GIT_WORK_TREE'] = @git_work_dir
-      ENV['GIT_INDEX_FILE'] = @git_index_file
-      ENV['GIT_SSH'] = Git::Base.config.git_ssh
-    end
-
-    # Runs a block inside an environment with customized ENV variables.
-    # It restores the ENV after execution.
-    #
-    # @param [Proc] block block to be executed within the customized environment
-    def with_custom_env_variables(&block)
-      @@semaphore.synchronize do
-        store_git_system_env_variables()
-        set_custom_git_env_variables()
-        return block.call()
-      end
-    ensure
-      restore_git_system_env_variables()
+    # git's ENV variables for the current instance.
+    def custom_git_env_variables
+      {
+        'GIT_DIR' => @git_dir,
+        'GIT_WORK_TREE' => @git_work_dir,
+        'GIT_INDEX_FILE' => @git_index_file,
+        'GIT_SSH' => Git::Base.config.git_ssh,
+      }
     end
 
     def command(*cmd, redirect: '', chomp: true, chdir: nil, &block)
@@ -1196,19 +1167,8 @@ def command(*cmd, redirect: '', chomp: true, chdir: nil, &block)
 
       git_cmd = "#{Git::Base.config.binary_path} #{global_opts} #{escaped_cmd} #{redirect} 2>&1"
 
-      output = nil
-
-      command_thread = nil;
-
-      status = nil
-
-      with_custom_env_variables do
-        command_thread = Thread.new do
-          output = run_command(git_cmd, chdir, &block)
-          status = $?
-        end
-        command_thread.join
-      end
+      output = run_command(git_cmd, chdir, &block)
+      status = $?
 
       @logger.info(git_cmd)
       @logger.debug(output)
@@ -1293,9 +1253,9 @@ def run_command(git_cmd, chdir=nil, &block)
       end
 
       if chdir
-        IO.popen(git_cmd, chdir: chdir, &block)
+        IO.popen(custom_git_env_variables, git_cmd, chdir: chdir, &block)
       else
-        IO.popen(git_cmd, &block)
+        IO.popen(custom_git_env_variables, git_cmd, &block)
       end
     end
 
