cmd: properly handle cwd for repos with work trees

davvid · davvid · commit abc2e538c6f2 · 2008-06-12T03:01:09.000-07:00
This is a fix on top of Govind's latest performance improvement.

self._cwd was always set to self._git_dir which means
a lot of commands that require work trees were not available
to GitPython.  Execute now uses self._cwd which is equal to
self._git_dir by default, and self.get_work_tree() if a work tree
exists.

Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
diff --git a/lib/git/cmd.py b/lib/git/cmd.py
@@ -24,6 +24,9 @@ def refresh(self):
         self._git_dir = None
         self._is_in_repo = not not self.get_git_dir()
         self._work_tree = None
+        self._cwd = self._git_dir
+        if self._git_dir:
+            self._cwd = self.get_work_tree()
 
     def _is_git_dir(self, d):
         """ This is taken from the git setup.c:is_git_directory
@@ -115,7 +118,7 @@ def execute(self, command,
 
         # Start the process
         proc = subprocess.Popen(command,
-                                cwd=self._git_dir,
+                                cwd=self._cwd,
                                 stdin=istream,
                                 stderr=stderr,
                                 stdout=subprocess.PIPE
