Emacs Stack Exchange is a question and answer site for those using, extending or developing Emacs. It only takes a minute to sign up.
Sign up to join this community
I am currently on master branch and I have to create new branch called test starting from master.
If I run b c in magit buffer, magit will prompt for starting point
Create branch starting at (default master):
How to prevent this and always use the current branch?
The offered default is the current branch, therefore there already is a key binding for creating a new branch starting at the current branch. But that binding is b c RET, not b c.
Okay that was a slight simplification. If and only if there is a branch at point (e.g. in a log or the references buffer) then that branch is offered as the default instead.
magit-branch, look at what happens inside magit-branch-read-args and do something similar inside the interactive of the copy. Then you have to bind that new command in the popup as described here. I.e. my claim that there is a key binding b c RET is not technically correct.
If you're running a Magit version newer than 2.8 (the relevant commit was on 2016-10-10), you can customize the user option magit-no-confirm-default.
If you add magit-branch-and-checkout to that list, then when you use bc you will only need to enter the new branch name, and Magit will use the default start point without prompting you.
n.b. That default start point is contextual! The prompt for the new branch will indicate what the start point will be.
e.g. If you are viewing a Magit Log or Magit Refs buffer, the start point would reflect the ref at point, rather than the branch you currently have checked out.
As @Tarsius mentions, you can define your own command to do this.
(defun wh/magit-branch-from-current-and-checkout (branch)
"Create and checkout BRANCH from the current branch."
(interactive (list (magit-read-string-ns "Branch name")))
(let ((start-point (magit-get-current-branch)))
(if (string-match-p "^stash@{[0-9]+}$" start-point)
(magit-run-git "stash" "branch" branch start-point)
(magit-call-git "checkout" "-b" branch start-point)
(--when-let (and (magit-get-upstream-branch branch)
(magit-get-indirect-upstream-branch start-point))
(magit-call-git "branch" (concat "--set-upstream-to=" it) branch))
(magit-refresh))))
You can add this to the existing branch popup. In this case, I've chosen b f as the keybinding (as it's currently unused).
(magit-define-popup-action 'magit-branch-popup
?f "new branch From current" #'wh/magit-branch-from-current-and-checkout)
If you don't have unpushed commits on your current branch, you can also use b s (bound to magit-branch-spinoff) to create a new branch without prompting for the base branch.
masterbranch will be used by default. This default may change depending on your previous choices. Always branching frommasterbranch is not very good idea too. It may seem so if you work with simple pet projects, but once you work in a team, using something like git-flow, you will want to always explicitly choose