diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-07-19 11:57:34 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-07-19 11:57:34 +0200 |
| commit | 89422841e46efa99bda49acfbe33ee1ca5122845 (patch) | |
| tree | 4d0d54f2d8a0af7b557d4e51263a3923d885ea24 /lib/git/index/base.py | |
| parent | 3d9310055f364cf3fa97f663287c596920d6e7e5 (diff) | |
| download | gitpython-89422841e46efa99bda49acfbe33ee1ca5122845.tar.gz | |
index: Fixed bug which caused incorrect separators in output files of the return value
remote: fixed evil bug that was caused by some inconsistency of python when __getattr__ and __slots__ are invovled - namely it calles getattr before checking for a slot of the same name, in an alternating fashion
Diffstat (limited to 'lib/git/index/base.py')
| -rw-r--r-- | lib/git/index/base.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/git/index/base.py b/lib/git/index/base.py index bfbcf841..ff01a3a4 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -1021,14 +1021,14 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): checked_out_files = list() for path in paths: - path = self._to_relative_path(path) + co_path = to_native_path_linux(self._to_relative_path(path)) # if the item is not in the index, it could be a directory path_is_directory = False try: - self.entries[(path, 0)] + self.entries[(co_path, 0)] except KeyError: - dir = path + dir = co_path if not dir.endswith('/'): dir += '/' for entry in self.entries.itervalues(): @@ -1043,9 +1043,9 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): # END path exception handlnig if not path_is_directory: - self._write_path_to_stdin(proc, path, path, make_exc, + self._write_path_to_stdin(proc, co_path, path, make_exc, fprogress, read_from_stdout=False) - checked_out_files.append(path) + checked_out_files.append(co_path) # END path is a file # END for each path self._flush_stdin_and_wait(proc, ignore_stdout=True) |