[meld] Fix unversioned/ignored statuses in Git subdirectories (bgo#699342)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Fix unversioned/ignored statuses in Git subdirectories (bgo#699342)
- Date: Fri, 3 May 2013 21:44:24 +0000 (UTC)
commit dba35cc8bae1ff3bb22ae9a57e4f28d6863d9dce
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat May 4 07:00:46 2013 +1000
Fix unversioned/ignored statuses in Git subdirectories (bgo#699342)
meld/vc/git.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 13420ad..06fdcb6 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -259,11 +259,11 @@ class Vc(_vc.CachedVc):
self._tree_meta_cache[path] = msg
for entry in ignored_entries:
- path = os.path.join(self.root, entry.strip())
+ path = os.path.join(self.location, entry.strip())
tree_state[path] = _vc.STATE_IGNORED
for entry in unversioned_entries:
- path = os.path.join(self.root, entry.strip())
+ path = os.path.join(self.location, entry.strip())
tree_state[path] = _vc.STATE_NONE
def _lookup_tree_cache(self, rootdir):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]