branch: elpa/magit commit bdbd8eb7678aabac3036cd9d3b908342f2580956 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-untracked-files: Remove COMPACT argument again It was added in [1: 581979b555], so that `magit-insert-untracked-files' didn't have to do it. But this is not the appropriate place to handle this special case. This commit does not change back `magit-insert-untracked-files' to take care of this performance tweaks itself. Dealing with performance issues is left to subsequent commits. 1: 2024-06-24 581979b555b06be71f2ee5beeb558ecf1416ab4b magit-untracked-files: Optionally return compact list --- lisp/magit-git.el | 14 ++++---------- lisp/magit-status.el | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 64c40706a64..8a55ce205c7 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -1048,16 +1048,10 @@ tracked file." (defun magit-tracked-files () (magit-list-files "--cached")) -(defun magit-untracked-files (&optional all files compact) - (if compact - (--mapcat (and (eq (aref it 0) ??) - (list (substring it 3))) - (magit-git-items "status" "-z" "--porcelain" - (magit-ignore-submodules-p t) - "--" files)) - (magit-list-files "--other" - (and (not all) "--exclude-standard") - "--" files))) +(defun magit-untracked-files (&optional all files) + (magit-list-files "--other" + (and (not all) "--exclude-standard") + "--" files)) (defun magit-modified-files (&optional nomodules files) (magit-git-items "diff-index" "-z" "--name-only" diff --git a/lisp/magit-status.el b/lisp/magit-status.el index 193693d4dee..c3e0683ced8 100644 --- a/lisp/magit-status.el +++ b/lisp/magit-status.el @@ -775,7 +775,7 @@ set using \"D -- DIRECTORY RET g\"." (base (car magit-buffer-diff-files)) (base (and base (file-directory-p base) base))) (magit-insert-files 'untracked - (lambda () (magit-untracked-files nil base all)) + (lambda () (magit-untracked-files nil base)) all))))) (defun magit-insert-tracked-files ()