1 files changed, 46 insertions, 14 deletions

diff --git a/git/cmd.py b/git/cmd.py
index 7e15d4ea..429046be 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -26,7 +26,10 @@ from .util import (
     stream_copy,
     WaitGroup
 )
-from .exc import GitCommandError
+from .exc import (
+    GitCommandError,
+    GitCommandNotFound
+)
 from git.compat import (
     string_types,
     defenc,
@@ -241,6 +244,12 @@ class Git(LazyMixin):
     _git_exec_env_var = "GIT_PYTHON_GIT_EXECUTABLE"
     GIT_PYTHON_GIT_EXECUTABLE = os.environ.get(_git_exec_env_var, git_exec_name)
 
+    # If True, a shell will be used when executing git commands.
+    # This should only be desirable on windows, see https://github.com/gitpython-developers/GitPython/pull/126
+    # for more information
+    # Override this value using `Git.USE_SHELL = True`
+    USE_SHELL = False
+
     class AutoInterrupt(object):
 
         """Kill/Interrupt the stored process instance once this instance goes out of scope. It is
@@ -543,18 +552,29 @@ class Git(LazyMixin):
         env["LC_MESSAGES"] = "C"
         env.update(self._environment)
 
-        proc = Popen(command,
-                     env=env,
-                     cwd=cwd,
-                     stdin=istream,
-                     stderr=PIPE,
-                     stdout=PIPE,
-                     # Prevent cmd prompt popups on windows by using a shell ... .
-                     # See https://github.com/gitpython-developers/GitPython/pull/126
-                     shell=sys.platform == 'win32',
-                     close_fds=(os.name == 'posix'),  # unsupported on windows
-                     **subprocess_kwargs
-                     )
+        if sys.platform == 'win32':
+            cmd_not_found_exception = WindowsError
+        else:
+            if sys.version_info[0] > 2:
+                cmd_not_found_exception = FileNotFoundError  # NOQA # this is defined, but flake8 doesn't know
+            else:
+                cmd_not_found_exception = OSError
+        # end handle
+
+        try:
+            proc = Popen(command,
+                         env=env,
+                         cwd=cwd,
+                         stdin=istream,
+                         stderr=PIPE,
+                         stdout=PIPE,
+                         shell=self.USE_SHELL,
+                         close_fds=(os.name == 'posix'),  # unsupported on windows
+                         **subprocess_kwargs
+                         )
+        except cmd_not_found_exception as err:
+            raise GitCommandNotFound(str(err))
+
         if as_process:
             return self.AutoInterrupt(proc, command)
 
@@ -753,11 +773,23 @@ class Git(LazyMixin):
             except KeyError:
                 pass
 
+        insert_after_this_arg = kwargs.pop('insert_kwargs_after', None)
+
         # Prepare the argument list
         opt_args = self.transform_kwargs(**kwargs)
         ext_args = self.__unpack_args([a for a in args if a is not None])
 
-        args = opt_args + ext_args
+        if insert_after_this_arg is None:
+            args = opt_args + ext_args
+        else:
+            try:
+                index = ext_args.index(insert_after_this_arg)
+            except ValueError:
+                raise ValueError("Couldn't find argument '%s' in args %s to insert kwargs after"
+                                 % (insert_after_this_arg, str(ext_args)))
+            # end handle error
+            args = ext_args[:index + 1] + opt_args + ext_args[index + 1:]
+        # end handle kwargs
 
         def make_call():
             call = [self.GIT_PYTHON_GIT_EXECUTABLE]