From fa350d16d4ed8ef87de02025bdcfeb0ea5bd4ede Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 22 Jul 2025 11:34:44 +0100 Subject: [PATCH] * lisp/vc/vc-git.el (vc-git-diff): Don't pass --textconv. This reverts this change: Author: Sean Whitton AuthorDate: Mon Jul 21 09:26:59 2025 +0100 * lisp/vc/vc-git.el (vc-git-diff): Pass --textconv (bug#79050). (cherry picked from commit d381a7e79932f83aafb4de0340037f393ed031b5) --- lisp/vc/vc-git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a6e5ceaf8e6..dd536c5674f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1829,7 +1829,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (if async 'async 1) files command - "--exit-code" "--textconv" + "--exit-code" (append (vc-switches 'git 'diff) (list "-p" (or rev1 "HEAD") rev2 "--"))) (vc-git-command (or buffer "*vc-diff*") 1 files -- 2.39.5