branch: elpa/magit
commit 64d3aca420254b95cd70e0943a0c1c7c98f06b1b
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
magit--merge-absorb: Add MESSAGE argument
`forge-pullreq-state-set-merged' is going to use this.
---
lisp/magit-merge.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index e5280f5c4f..4dc003ff62 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -166,7 +166,7 @@ then also remove the respective remote branch."
(magit-merge-arguments)))
(magit--merge-absorb branch args))
-(defun magit--merge-absorb (branch args)
+(defun magit--merge-absorb (branch args &optional message)
(when (equal branch (magit-main-branch))
(unless (yes-or-no-p
(format "Do you really want to merge `%s' into another branch? "
@@ -183,7 +183,9 @@ then also remove the respective remote branch."
(magit-process-sentinel process event)
(process-put process 'inhibit-refresh t)
(magit-process-sentinel process event)
- (magit--merge-absorb-1 branch args))))))
+ (magit--merge-absorb-1 branch args))
+ (when message
+ (message message))))))
(magit--merge-absorb-1 branch args)))
(defun magit--merge-absorb-1 (branch args)
