emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 466c7adf5d: magit-modified-files: Use just one


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 466c7adf5d: magit-modified-files: Use just one call to git-diff-files
Date: Fri, 28 Jan 2022 07:59:01 -0500 (EST)

branch: elpa/git-commit
commit 466c7adf5de85257712629dfa637dc03b9bc6cb4
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-modified-files: Use just one call to git-diff-files
    
    If a file is modified and staged and then the working tree file
    is reverted to the HEAD state, then "git diff-index HEAD" lists
    it anyway.
    
    Suggested-by: Kyle Meyer <kyle@kyleam.com>
---
 lisp/magit-git.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 03f577ba51..e45c0ad7ca 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -924,10 +924,9 @@ tracked file."
   (magit-list-files "--other" (unless all "--exclude-standard") "--" files))
 
 (defun magit-modified-files (&optional nomodules files)
-  (delete-consecutive-dups
-   (sort (nconc (magit-staged-files nomodules files)
-                (magit-unstaged-files nomodules files))
-         #'string<)))
+  (magit-git-items "diff-index" "-z" "--name-only"
+                   (and nomodules "--ignore-submodules")
+                   (magit-headish) "--" files))
 
 (defun magit-unstaged-files (&optional nomodules files)
   (magit-git-items "diff-files" "-z" "--name-only"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]