mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-13 09:30:24 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Juanma Barranquero 2009-12-28 03:43:28 +01:00
parent e0425934a0
commit 58941d03a5
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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> 2009-12-26 Kevin Ryde <user42@zip.com.au>
* info-look.el (sh-mode): Look for coreutils new "Concept Index" * info-look.el (sh-mode): Look for coreutils new "Concept Index"

2
lisp/vc-git.el
View file

@ -555,7 +555,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(apply 'vc-git-command buffer (apply 'vc-git-command buffer
'async files 'async files
(append (append
'("log") '("log" "--no-color")
(when shortlog (when shortlog
'("--graph" "--decorate" '("--graph" "--decorate"
"--date=short" "--pretty=format:%d%h %ad %s" "--abbrev-commit")) "--date=short" "--pretty=format:%d%h %ad %s" "--abbrev-commit"))