stgit.el: Ask for branch point when creating new branch

This makes sure git-config branch.<branch>.parentbranch is set correctly.

Signed-off-by: Gustav Hållberg <gustav@gmail.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/contrib/stgit.el b/contrib/stgit.el
index f42ad58..d3d518d 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -1494,9 +1494,16 @@ If ALL is not nil, also return non-stgit branches."
               ((not (string-match stgit-allowed-branch-name-re branch))
                (error "Invalid branch name"))
               ((yes-or-no-p (format "Create branch \"%s\"? " branch))
-               (stgit-capture-output nil (stgit-run "branch" "--create" "--"
-                                                    branch))
-               t))
+               (let ((branch-point (completing-read
+                                    "Branch from (default current branch): "
+                                    (stgit-available-branches))))
+                 (stgit-capture-output nil
+                   (apply 'stgit-run
+                          `("branch" "--create" "--"
+                            ,branch
+                            ,@(unless (zerop (length branch-point))
+                                (list branch-point)))))
+                 t)))
     (stgit-reload)))
 
 (defun stgit-available-refs (&optional omit-stgit)