Supersede color.diff settings in git log (bug#5211).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d54f5f08dde031392e3889fb63067a92e5e2c84..458368f72b4adc46eb89eda97d291167497a14ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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"

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 69e861434bad2bb89ff25ff7ddbe3ac6668194f9..1970cb1460a30fa0c09ddbb32369d9e0f1116515 100644 (file)
--- 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"))