GNU bug report logs - #79050
vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked

Previous Next

Package: emacs;

Reported by: James Cherti <contact <at> jamescherti.com>

Date: Sat, 19 Jul 2025 18:01:02 UTC

Severity: normal

Tags: notabug

Done: Sean Whitton <spwhitton <at> spwhitton.name>

Full log


Message #8 received at 79050 <at> debbugs.gnu.org (full text, mbox):

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: James Cherti <contact <at> jamescherti.com>
Cc: 79050 <at> debbugs.gnu.org
Subject: Re: bug#79050: vc-git incorrectly treats git-crypt encrypted files
 as binary, even when unlocked
Date: Sun, 20 Jul 2025 11:45:32 +0100
Hello James,

Is this enough to fix it?

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f462fb1959f..9d351797bef 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1829,7 +1829,7 @@ vc-git-diff
                (if async 'async 1)
                files
                command
-               "--exit-code"
+               "--exit-code" "--textconv"
                (append (vc-switches 'git 'diff)
                        (list "-p" (or rev1 "HEAD") rev2 "--")))
       (vc-git-command (or buffer "*vc-diff*") 1 files
--8<---------------cut here---------------end--------------->8---

-- 
Sean Whitton




This bug report was last modified 9 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.