From 694265664422abab56e059b5d1c3b9cc05581074 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 15 Jul 2010 17:08:14 +0200 Subject: Index._iter_expand_paths: fixed tiny error with large impact, there was code using a / in a hardcoded fashion, leading to absolute paths where the caller expected relative ones --- lib/git/ext/gitdb | 2 +- lib/git/index/base.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/git/ext/gitdb b/lib/git/ext/gitdb index 425ecf04..18152feb 160000 --- a/lib/git/ext/gitdb +++ b/lib/git/ext/gitdb @@ -1 +1 @@ -Subproject commit 425ecf04aa5038c3d46b01ca20de17c51ef6c4e5 +Subproject commit 18152febd428e67b86bb4fb68ec1691d4de75a9c diff --git a/lib/git/index/base.py b/lib/git/index/base.py index cda52f75..bfbcf841 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -370,7 +370,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): def raise_exc(e): raise e r = self.repo.working_tree_dir - rs = r + '/' + rs = r + os.sep for path in paths: abs_path = path if not os.path.isabs(abs_path): @@ -667,7 +667,6 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): # paths can be git-added, for everything else we use git-update-index entries_added = list() paths, entries = self._preprocess_add_items(items) - if paths and path_rewriter: for path in paths: abspath = os.path.abspath(path) -- cgit v1.2.3