# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1261968347 -3600
# Node ID c6758afd00db09e1377a7730c448f269f6f92a32
# Parent  5920a711085633fdd7f39dbd1bddd56c7071c9d6# Parent  7c505f803ab177feaf78efdb49b47c0bce3440ce
Supersede color.diff settings in git log (bug#5211).

diff -r 5920a7110856 -r c6758afd00db lisp/ChangeLog
--- 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"
diff -r 5920a7110856 -r c6758afd00db lisp/vc-git.el
--- 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"))