Просмотр исходного кода

Temporarily unset GIT_EXTERNAL_DIFF when invoking git diff.

When the git diff command is customized through setting GIT_EXTERNAL_DIFF in the environment, the output of cdiff is broken and defaults to the output of the tool git has been configured to use.

Temporarily unsetting this variable when cdiff invokes git diff fixes the issue.
killarny 11 лет назад
Родитель
Сommit
bcb99110bd
1 измененных файлов: 1 добавлений и 1 удалений
  1. 1
    1
      cdiff.py

+ 1
- 1
cdiff.py Просмотреть файл

@@ -54,7 +54,7 @@ COLORS = {
54 54
 VCS_INFO = {
55 55
     'Git': {
56 56
         'probe' : ['git', 'rev-parse'],
57
-        'diff'  : ['git', 'diff'],
57
+        'diff'  : ['env', '-u', 'GIT_EXTERNAL_DIFF', 'git', 'diff'],
58 58
         'log'   : ['git', 'log', '--patch'],
59 59
     },
60 60
     'Mercurial': {