From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Wed, 9 Nov 2022 21:16:55 +0000 (-0500)
Subject: vc-git: Ensure git doesn't try to colorize stashes
X-Git-Tag: emacs-29.0.90~1616^2~179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ccc385ab136e9794ba7f9ee61d8e4643331887d;p=emacs.git

vc-git: Ensure git doesn't try to colorize stashes

* lisp/vc/vc-git.el (vc-git-stash-show): Add --color=never to git
flags.  (Bug#59158)
---

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 74536309e29..a1ff03144bc 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1883,7 +1883,8 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
   "Show the contents of stash NAME."
   (interactive (list (vc-git-stash-read "Show stash: ")))
   (vc-setup-buffer "*vc-git-stash*")
-  (vc-git-command "*vc-git-stash*" 'async nil "stash" "show" "-p" name)
+  (vc-git-command "*vc-git-stash*" 'async nil
+                  "stash" "show" "--color=never" "-p" name)
   (set-buffer "*vc-git-stash*")
   (setq buffer-read-only t)
   (diff-mode)