From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 28 Jun 2018 00:03:36 +0000 (+0300)
Subject: Speed up vc-git-dir-status-files
X-Git-Tag: emacs-26.1.90~315
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a7f423;p=emacs.git

Speed up vc-git-dir-status-files

* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Call 'git
ls-files -u' for the ls-files-conflict stage
(https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00885.html).
---

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index c6b08e942f3..11b9b34ff69 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -581,7 +581,7 @@ or an empty string if none."
                        "ls-files" "-z" "-c" "-s" "--"))
       (`ls-files-conflict
        (vc-git-command (current-buffer) 'async files
-                       "ls-files" "-z" "-c" "-s" "--"))
+                       "ls-files" "-z" "-u" "--"))
       (`ls-files-unknown
        (vc-git-command (current-buffer) 'async files
                        "ls-files" "-z" "-o" "--directory"