branch: elpa/git-commit
commit 72dc1032fe9ab4c4a9ddf2d115c499e02921b0b8
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
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)))))
