[nongnu] elpa/git-commit 6a711f1b94: Make magit-log-merged's number of shown commits configurable

[ELPA Syncer]

branch: elpa/git-commit
commit 6a711f1b94abe2858ebbb57ef6b58847f21809c4
Author: Daanturo <daanturo@gmail.com>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Make magit-log-merged's number of shown commits configurable
    
    By setting magit-log-merged-commit-count.
---
 docs/RelNotes/3.3.0.org |  2 ++
 lisp/magit-log.el       | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/RelNotes/3.3.0.org b/docs/RelNotes/3.3.0.org
index be74f192d7..c518a5f2ba 100644
--- a/docs/RelNotes/3.3.0.org
+++ b/docs/RelNotes/3.3.0.org
@@ -99,6 +99,8 @@ Also see https://emacsair.me/2021/10/04/magit-3.3.
 
 - Added new option ~git-commit-use-local-message-ring~.  #4503
 
+- Added new option ~magit-log-merged-commit-count~. #4711
+
 ** Fixes since v3.2.0
 
 - Make ~magit-branch-remote-head~ and ~magit-branch-current~ fall back
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index e6f9d27656..77b2ce40bd 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -301,6 +301,14 @@ the upstream isn't ahead of the current branch) show."
   :group 'magit-status
   :type 'number)
 
+(defcustom magit-log-merged-commit-count 20
+  "How many surrounding commits to show for `magit-log-merged'.
+`magit-log-merged' will shows approximately half of this number
+commits before and half after."
+  :package-version '(magit . "3.3.0")
+  :group 'magit-log
+  :type 'integer)
+
 ;;; Arguments
 ;;;; Prefix Classes
 
@@ -807,9 +815,9 @@ restrict the log to the lines that the region touches."
   "Show log for the merge of COMMIT into BRANCH.
 
 More precisely, find merge commit M that brought COMMIT into
-BRANCH, and show the log of the range \"M^1..M\".  If COMMIT is
-directly on BRANCH, then show approximately twenty surrounding
-commits instead.
+BRANCH, and show the log of the range \"M^1..M\". If COMMIT is
+directly on BRANCH, then show approximately
+`magit-log-merged-commit-count' surrounding commits instead.
 
 This command requires git-when-merged, which is available from
 https://github.com/mhagger/git-when-merged.";
@@ -835,8 +843,10 @@ https://github.com/mhagger/git-when-merged.";
       ;; This is not the same as `string-trim'.
       (setq m (string-trim-left (substring m (string-match " " m))))
       (if (equal m "Commit is directly on this branch.")
-          (let* ((from (concat commit "~10"))
-                 (to (- (car (magit-rev-diff-count branch commit)) 10))
+          (let* ((from (format "%s~%d" commit
+                               (/ magit-log-merged-commit-count 2)))
+                 (to (- (car (magit-rev-diff-count branch commit))
+                        (/ magit-log-merged-commit-count 2)))
                  (to (if (<= to 0)
                          branch
                        (format "%s~%s" branch to))))