Merge pull request #48545 from bbinet/fix-unreacheable-ssh-id-wrapper

Fix unreachable ssh-id-wrapper template when root_dir is relative
saltstack · Aug 21, 2018 · 60605f0 · 60605f0
2 parents a4c51a9 + 284dcf7
commit 60605f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/modules/git.py b/salt/modules/git.py
@@ -265,10 +265,10 @@ def _git_run(command, cwd=None, user=None, password=None, identity=None,
 
             # copy wrapper to area accessible by ``runas`` user
             # currently no support in windows for wrapping git ssh
-            ssh_id_wrapper = os.path.join(
+            ssh_id_wrapper = os.path.abspath(os.path.join(
                 salt.utils.templates.TEMPLATE_DIRNAME,
                 'git/ssh-id-wrapper'
-            )
+            ))
             tmp_ssh_wrapper = None
             if salt.utils.platform.is_windows():
                 ssh_exe = _find_ssh_exe()