Mercurial > emacs
changeset 106661:c6758afd00db
Supersede color.diff settings in git log (bug#5211).
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 28 Dec 2009 03:45:47 +0100 |
| parents | 5920a7110856 (current diff) 7c505f803ab1 (diff) |
| children | be76428f0577 a74420eea37d |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 28 03:13:43 2009 +0100 +++ b/lisp/ChangeLog Mon Dec 28 03:45:47 2009 +0100 @@ -1,3 +1,11 @@ +2009-12-28 Juanma Barranquero <lekktu@gmail.com> + + Supersede color.diff settings in git log (bug#5211). + + * vc-git.el (vc-git-print-log): Pass "--no-color" to log to avoid + escape chars in its output when the user has color.diff set to `always'. + This fix works on git 1.4.2 and newer (released on 2006-08-13). + 2009-12-26 Kevin Ryde <user42@zip.com.au> * info-look.el (sh-mode): Look for coreutils new "Concept Index"
--- a/lisp/vc-git.el Mon Dec 28 03:13:43 2009 +0100 +++ b/lisp/vc-git.el Mon Dec 28 03:45:47 2009 +0100 @@ -555,7 +555,7 @@ (apply 'vc-git-command buffer 'async files (append - '("log") + '("log" "--no-color") (when shortlog '("--graph" "--decorate" "--date=short" "--pretty=format:%d%h %ad %s" "--abbrev-commit"))