[nongnu] elpa/git-commit 72b4c311c0 1/3: magit-log-merged: Fix for merged commits

[ELPA Syncer]

branch: elpa/git-commit
commit 72b4c311c0fbbcc8222868fe8198f45da0f9d65e
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-log-merged: Fix for merged commits
---
 lisp/magit-log.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 16c4e277ea..7045f25d78 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -829,8 +829,11 @@ https://github.com/mhagger/git-when-merged.";
                                       commit branch)))
       (setq m (buffer-substring-no-properties (point) (line-end-position))))
     (if (zerop exit)
-        (magit-log-setup-buffer (list (format "%s^1..%s" m m))
-                                args files nil commit)
+        (magit-log-setup-buffer
+         (list (format "%s^1..%s"
+                       (magit-git-string "merge-base" (concat m "^") commit)
+                       m))
+         args files nil commit)
       (setq m (string-trim m))
       (if (equal m "Commit is directly on this branch.")
           (let* ((from (concat commit "~10"))