Moved git wrapper script to the package templates directory

MANIFEST.in

@@ -13,3 +13,4 @@ recursive-include scripts *
 include conf/*
 recursive-include pkg *
 recursive-include salt *.jinja
+include salt/templates/git/ssh-id-wrapper

salt/modules/git.py

@@ -36,7 +36,8 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
 
     if identity:
         env = {
-            'GIT_SSH': 'salt-git-ssh',
+            'GIT_SSH': os.path.join(salt.utils.templates.TEMPLATE_DIRNAME,
+                                    'ssh-id-wrapper'),
             'GIT_IDENTITY': identity
         }
 

setup.py

@@ -465,7 +465,8 @@ SETUP_KWARGS = {'name': NAME,
                 'package_data': {'salt.templates': [
                                     'rh_ip/*.jinja',
                                     'debian_ip/*.jinja',
-                                    'virt/*.jinja'
+                                    'virt/*.jinja',
+                                    'git/*'
                                     ],
                                  'salt.daemons.flo': [
                                     '*.flo'
@@ -620,7 +621,6 @@ else:
         SETUP_KWARGS['scripts'].extend([
             'scripts/salt',
             'scripts/salt-cloud',
-            'scripts/salt-git-ssh',
             'scripts/salt-key',
             'scripts/salt-master',
             'scripts/salt-run',