Browse Source

Fix issue #23 with --no-ext-diff

Matthew Wang 11 years ago
commit
793ab33da2
2 changed files with 7 additions and 2 deletions
  1. 5
    0
      CHANGES
  2. 2
    2
      cdiff.py

+ 5
- 0
CHANGES View File

2
 Change log
2
 Change log
3
 ==========
3
 ==========
4
 
4
 
5
+Version 0.9.1 (2013-05-20)
6
+
7
+  - Use `--no-ext-diff` to disable GIT_EXTERNAL_DIFF and diff.external which
8
+    might break cdiff output
9
+
5
 Version 0.9 (2013-03-23)
10
 Version 0.9 (2013-03-23)
6
 
11
 
7
   - Supports reading context diff via ``filterdiff`` (patchutils)
12
   - Supports reading context diff via ``filterdiff`` (patchutils)

+ 2
- 2
cdiff.py View File

8
 """
8
 """
9
 
9
 
10
 META_INFO = {
10
 META_INFO = {
11
-    'version'     : '0.9',
11
+    'version'     : '0.9.1',
12
     'license'     : 'BSD-3',
12
     'license'     : 'BSD-3',
13
     'author'      : 'Matthew Wang',
13
     'author'      : 'Matthew Wang',
14
     'email'       : 'mattwyl(@)gmail(.)com',
14
     'email'       : 'mattwyl(@)gmail(.)com',
54
 VCS_INFO = {
54
 VCS_INFO = {
55
     'Git': {
55
     'Git': {
56
         'probe' : ['git', 'rev-parse'],
56
         'probe' : ['git', 'rev-parse'],
57
-        'diff'  : ['env', '-u', 'GIT_EXTERNAL_DIFF', 'git', 'diff'],
57
+        'diff'  : ['git', 'diff', '--no-ext-diff'],
58
         'log'   : ['git', 'log', '--patch'],
58
         'log'   : ['git', 'log', '--patch'],
59
     },
59
     },
60
     'Mercurial': {
60
     'Mercurial': {