Re: vc-dir operation is very slow on large git repositories in Emacs 26.1

[Dmitry Gutov]

On 6/27/18 5:49 AM, Tom Tromey wrote:
> > > Not exactly an expert, but googling suggests 'git ls-files -u' as the
> > > answer. Please be aware that the output will have 3 entries for every
> > > conflicting file: merge base, theirs, and ours.
>
> Dmitry> Tom, any reason you did not choose this option?
>
> I'm afraid I don't remember any more.

OK. Too bad the commit didn't include tests.

So I think we should try it and see if anything broken comes up?

Eli, OK for emacs-26?

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 88052d7749..3f66bff89f 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -584,7 +584,7 @@ vc-git-dir-status-goto-stage
                        "ls-files" "-z" "-c" "-s" "--"))
       (`ls-files-conflict
        (vc-git-command (current-buffer) 'async files
-                       "ls-files" "-z" "-c" "-s" "--"))
+                       "ls-files" "-z" "-u" "-s" "--"))
       (`ls-files-unknown
        (vc-git-command (current-buffer) 'async files
                        "ls-files" "-z" "-o" "--directory"