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

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

[nongnu] elpa/git-commit 72dc1032fe 1/2: fixup(d1e2beb866) magit-file-ch


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 72dc1032fe 1/2: fixup(d1e2beb866) magit-file-checkout: Support selecting a directory
Date: Thu, 11 Jul 2024 22:00:25 -0400 (EDT)

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

    fixup(d1e2beb866) magit-file-checkout: Support selecting a directory
    
    The second argument doesn't become optional until Emacs 30.1.
---
 lisp/magit-files.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 68736a48c9..09947a013f 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -500,7 +500,8 @@ Git, then fallback to using `delete-file'."
 (defun magit-read-file-from-rev (rev prompt &optional default include-dirs)
   (let ((files (magit-revision-files rev)))
     (when include-dirs
-      (setq files (sort (nconc files (magit-revision-directories rev)))))
+      (setq files (sort (nconc files (magit-revision-directories rev))
+                        #'string<)))
     (magit-completing-read
      prompt files nil t nil 'magit-read-file-hist
      (car (member (or default (magit-current-file)) files)))))



reply via email to

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