Revert "fix git wrapper (#29069)"

This reverts commit f8005d2737.

fix needs to be rethought as it applies to only newer git versions
and use of env shell breaks with non 'bourne compatible' shells
pull/31329/head
Brian Coca 7 years ago committed by Toshio Kuratomi
parent a333f2e5b0
commit 6459bacb6b

@ -371,10 +371,9 @@ fi
def set_git_ssh(ssh_wrapper, key_file, ssh_opts): def set_git_ssh(ssh_wrapper, key_file, ssh_opts):
# git_ssh_command will override git_ssh, so only older git needs it if os.environ.get("GIT_SSH"):
del os.environ["GIT_SSH"]
os.environ["GIT_SSH"] = ssh_wrapper os.environ["GIT_SSH"] = ssh_wrapper
# using shell to avoid 'noexec' issues if module temp dir is located in such a mount
os.environ["GIT_SSH_COMMAND"] = '%s %s' % (os.environ.get('SHELL', '/bin/sh'), ssh_wrapper)
if os.environ.get("GIT_KEY"): if os.environ.get("GIT_KEY"):
del os.environ["GIT_KEY"] del os.environ["GIT_KEY"]

Loading…
Cancel
Save