[nongnu] elpa/git-commit cd6fbe2887 3/3: magit-branch-read-args: Read another name if chosen branch exists

[ELPA Syncer]

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

    magit-branch-read-args: Read another name if chosen branch exists
    
    Closes #4837.
---
 lisp/magit-branch.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 74d793aa40..47715affbc 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -409,7 +409,11 @@ when using `magit-branch-and-checkout'."
                     (magit-read-starting-point prompt choice default-start))
             (user-error "Not a valid starting-point: %s" choice))))
     (let ((branch (magit-read-string-ns (concat prompt " named"))))
-      (list branch (magit-read-starting-point prompt branch default-start)))))
+      (if (magit-branch-p branch)
+          (magit-branch-read-args
+           (format "Branch `%s' already exists; pick another name" branch)
+           default-start)
+        (list branch (magit-read-starting-point prompt branch 
default-start))))))
 
 ;;;###autoload
 (defun magit-branch-spinout (branch &optional from)