* lisp/vc/vc-git.el (vc-git-diff): Pass --textconv (bug#79050).

(cherry picked from commit 90fc061fd2d2ca95c91c4db74c6f58ec95f9620b)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index dd536c5674f3b3e4c5e344aca9cbeee6f0ca880b..a6e5ceaf8e677d7fd39c3bc1877a97af323552ca 100644 (file)
--- 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"
+               "--exit-code" "--textconv"
                (append (vc-switches 'git 'diff)
                        (list "-p" (or rev1 "HEAD") rev2 "--")))
       (vc-git-command (or buffer "*vc-diff*") 1 files