diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2018-06-28 03:03:36 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2018-06-28 03:03:36 +0300 |
| commit | 4a7f4232ed415e042a72b85d9c4de1f421ce2bce (patch) | |
| tree | 3a4bbb2c93eac6afabfee0d4cc3162c556688f96 /lisp | |
| parent | 9134c841f1c04c21c16e5661259a4bef3b1c3f5b (diff) | |
| download | emacs-4a7f4232ed415e042a72b85d9c4de1f421ce2bce.tar.gz | |
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).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc-git.el | 2 |
1 files changed, 1 insertions, 1 deletions
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" |