[meld] Treat unlisted files as normal (not ignored) in git (closes bgo#579786)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Treat unlisted files as normal (not ignored) in git (closes bgo#579786)
- Date: Fri, 25 Jun 2010 07:59:19 +0000 (UTC)
commit affbdb60923f2182d67f7b53f6869b90f9d93dac
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Jun 25 15:09:42 2010 +1000
Treat unlisted files as normal (not ignored) in git (closes bgo#579786)
meld/vc/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index a124bba..7b50cfd 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -116,7 +116,7 @@ class Vc(_vc.CachedVc):
retfiles = []
retdirs = []
for name,path in files:
- state = tree.get(path, _vc.STATE_IGNORED)
+ state = tree.get(path, _vc.STATE_NORMAL)
retfiles.append( _vc.File(path, name, state) )
for name,path in dirs:
# git does not operate on dirs, just files
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]