Fixed env args

aelaguiz · aelaguiz · commit 94d2dfc8a2f6 · 2014-05-09T06:15:47.000-05:00
diff --git a/git/cmd.py b/git/cmd.py
@@ -331,16 +331,25 @@ def execute(self, command,
         else:
           cwd=self._working_dir
 
-        if command[1] == 'pull' or command[1] == 'reset':
-            cwd += '/.git'
-          
+        import logging
+        log = logging.getLogger(u"cratejoy")
+        log.debug(u"Running command {} in {}".format(command, cwd))
+
+        env = os.environ.copy()
+        if env.get('GIT_DIR'):
+            del env['GIT_DIR']
+
+        #log.debug(env)
+        #log.debug(u"Args {}".format(subprocess_kwargs))
+
         # Start the process
         proc = Popen(command,
                         cwd=cwd,
                         stdin=istream,
                         stderr=PIPE,
                         stdout=PIPE,
                         close_fds=(os.name=='posix'),# unsupported on linux
+                        env=env,
                         **subprocess_kwargs
                         )
         if as_process:
