[Emacs-diffs] emacs-26 4a7f423 1/3: Speed up vc-git-dir-status-files

[Dmitry Gutov]

branch: emacs-26
commit 4a7f4232ed415e042a72b85d9c4de1f421ce2bce
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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).
---
 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 c6b08e9..11b9b34 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"