[meld/meld-1-8] Add missing status codes to git diff-index parsing



commit 45c3fc19d26111d93e31dc54130479a1c9fa48f1
Author: Tom Scytale <scytale gmail com>
Date:   Sat Nov 2 06:27:08 2013 +1000

    Add missing status codes to git diff-index parsing

 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 7bb6ed6..5e31841 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -42,7 +42,7 @@ class Vc(_vc.CachedVc):
     CMD = "git"
     NAME = "Git"
     VC_DIR = ".git"
-    GIT_DIFF_FILES_RE = ":(\d+) (\d+) [a-z0-9]+ [a-z0-9]+ ([ADMU])\t(.*)"
+    GIT_DIFF_FILES_RE = ":(\d+) (\d+) [a-z0-9]+ [a-z0-9]+ ([XADMTU])\t(.*)"
 
     VC_COLUMNS = (_vc.DATA_NAME, _vc.DATA_STATE, _vc.DATA_OPTIONS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]