[nongnu] elpa/git-commit 2e73b66c29: Revert last three commits

[ELPA Syncer]

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

    Revert last three commits
---
 lisp/magit-worktree.el | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lisp/magit-worktree.el b/lisp/magit-worktree.el
index 4845d7c06e..3e176e35e5 100644
--- a/lisp/magit-worktree.el
+++ b/lisp/magit-worktree.el
@@ -83,7 +83,10 @@ Used by `magit-worktree-checkout' and 
`magit-worktree-branch'."
 (defun magit-worktree-move (worktree path)
   "Move WORKTREE to PATH."
   (interactive
-   (list (magit-read-worktree "Move worktree")
+   (list (magit-completing-read "Move worktree"
+                                (cdr (magit-list-worktrees))
+                                nil t nil nil
+                                (magit-section-value-if 'worktree))
          (funcall magit-worktree-read-directory-name-function
                   "Move worktree to: ")))
   (if (file-directory-p (expand-file-name ".git" worktree))
@@ -104,7 +107,11 @@ Used by `magit-worktree-checkout' and 
`magit-worktree-branch'."
 (defun magit-worktree-delete (worktree)
   "Delete a worktree, defaulting to the worktree at point.
 The primary worktree cannot be deleted."
-  (interactive (list (magit-read-worktree "Delete worktree")))
+  (interactive
+   (list (magit-completing-read "Delete worktree"
+                                (cdr (magit-list-worktrees))
+                                nil t nil nil
+                                (magit-section-value-if 'worktree))))
   (if (file-directory-p (expand-file-name ".git" worktree))
       (user-error "Deleting %s would delete the shared .git directory" 
worktree)
     (let ((primary (file-name-as-directory (caar (magit-list-worktrees)))))
@@ -129,20 +136,13 @@ status is already being displayed in the current buffer,
 then show it in Dired instead."
   (interactive
    (list (or (magit-section-value-if 'worktree)
-             (magit-read-worktree "Show status for worktree" t))))
+             (magit-completing-read
+              "Show status for worktree"
+              (cl-delete (directory-file-name (magit-toplevel))
+                         (magit-list-worktrees)
+                         :test #'equal :key #'car)))))
   (magit-diff-visit-directory worktree))
 
-(defun magit-read-worktree (prompt &optional exclude-current)
-  (magit-completing-read
-   prompt
-   (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)
   (magit-convert-filename-for-git (expand-file-name path)))