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

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

[nongnu] elpa/git-commit a6ab38b701 3/3: magit-read-worktree: Allow excl


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit a6ab38b701 3/3: magit-read-worktree: Allow excluding current worktree
Date: Sun, 2 Jan 2022 05:57:56 -0500 (EST)

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

    magit-read-worktree: Allow excluding current worktree
---
 lisp/magit-worktree.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/magit-worktree.el b/lisp/magit-worktree.el
index dd382328c3..4845d7c06e 100644
--- a/lisp/magit-worktree.el
+++ b/lisp/magit-worktree.el
@@ -129,18 +129,18 @@ status is already being displayed in the current buffer,
 then show it in Dired instead."
   (interactive
    (list (or (magit-section-value-if 'worktree)
-             (magit-completing-read
-              "Show status for worktree"
-              (cl-delete (directory-file-name (magit-toplevel))
-                         (magit-list-worktrees)
-                         :test #'equal :key #'car)))))
+             (magit-read-worktree "Show status for worktree" t))))
   (magit-diff-visit-directory worktree))
 
-(defun magit-read-worktree (prompt)
+(defun magit-read-worktree (prompt &optional exclude-current)
   (magit-completing-read
    prompt
-   (magit-list-worktrees)
-   nil t nil nil
+   (let ((dirs (magit-list-worktrees)))
+     (if exclude-current
+         (cl-delete (directory-file-name (magit-toplevel))
+                    dirs :test #'equal :key #'car)
+       dirs))
+   nil exclude-current nil nil
    (magit-section-value-if 'worktree)))
 
 (defun magit--expand-worktree (path)



reply via email to

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