From: Juanma Barranquero Date: Mon, 28 Dec 2009 02:43:28 +0000 (+0100) Subject: Supersede color.diff settings in git log (bug#5211). X-Git-Tag: emacs-pretest-23.1.91~17^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58941d03a598cdc5b73514ff042f05e56bca642c;p=emacs.git Supersede color.diff settings in git log (bug#5211). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d54f5f08dd..458368f72b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2009-12-28 Juanma Barranquero + + 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 * info-look.el (sh-mode): Look for coreutils new "Concept Index" diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 69e861434ba..1970cb1460a 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -555,7 +555,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (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"))