Simplify _safer_popen_windows "if shell" logic

This fixes a static typing error reported by mypy.

Using a separate variable, as I had done originally, does not seem
to be clearer than rebinding the parameter, and in this case the
code is simpler and can be checked by mypy without needing another
explicit type annotation to be added. This fixes one mypy error.

This also adds a comment to make clearer why the mapping passed in
is copied when modifications are needed, rather than mutated.

Author: EliahKagan

git/cmd.py

@@ -257,10 +257,9 @@ def _safer_popen_windows(
     # When using a shell, the shell is the direct subprocess, so the variable must be
     # set in its environment, to affect its search behavior. (The "1" can be any value.)
     if shell:
-        safer_env = {} if env is None else dict(env)
-        safer_env["NoDefaultCurrentDirectoryInExePath"] = "1"
-    else:
-        safer_env = env
+        # The original may be immutable or reused by the caller. Make changes in a copy.
+        env = {} if env is None else dict(env)
+        env["NoDefaultCurrentDirectoryInExePath"] = "1"
 
     # When not using a shell, the current process does the search in a CreateProcessW
     # API call, so the variable must be set in our environment. With a shell, this is
@@ -273,7 +272,7 @@ def _safer_popen_windows(
         return Popen(
             command,
             shell=shell,
-            env=safer_env,
+            env=env,
             creationflags=creationflags,
             **kwargs,
         )