diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2018-01-18 18:52:00 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2018-01-18 18:52:00 +0100 |
| commit | d6420549cea0ea82dda04944a08cb18af7340802 (patch) | |
| tree | 7753449b18b431985cc222e0795c50e30c9e7ad4 /lisp/magit-bisect.el | |
| parent | 4fa183f40c8e865c644730d291ca4d578b255fa7 (diff) | |
magit-confirm: Abort if user doesn't confirm
Previously we left that for the callers to do. Or not do - in
a few cases we should not abort when the user doesn't confirm
to allow other things to happen. Add a new argument NOABORT
to be used in those cases.
Diffstat (limited to 'lisp/magit-bisect.el')
| -rw-r--r-- | lisp/magit-bisect.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el index 2a34bf4..d5d8771 100644 --- a/lisp/magit-bisect.el +++ b/lisp/magit-bisect.el @@ -89,9 +89,9 @@ other actions from the bisect popup (\ (defun magit-bisect-reset () "After bisecting, cleanup bisection state and return to original `HEAD'." (interactive) - (when (magit-confirm 'reset-bisect) - (magit-run-git "bisect" "reset") - (ignore-errors (delete-file (magit-git-dir "BISECT_CMD_OUTPUT"))))) + (magit-confirm 'reset-bisect) + (magit-run-git "bisect" "reset") + (ignore-errors (delete-file (magit-git-dir "BISECT_CMD_OUTPUT")))) ;;;###autoload (defun magit-bisect-good () |