|
From: | Dmitry Gutov |
Subject: | Re: vc-dir operation is very slow on large git repositories in Emacs 26.1 |
Date: | Wed, 27 Jun 2018 12:41:49 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 |
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"
[Prev in Thread] | Current Thread | [Next in Thread] |