[nongnu] elpa/git-commit d57f8f2abd 2/3: Revert "magit-log-merged: Fix for merged commits"

[ELPA Syncer]

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

    Revert "magit-log-merged: Fix for merged commits"
    
    This reverts commit 72b4c311c0fbbcc8222868fe8198f45da0f9d65e.
    
    Go back to not showing the common parent and the commits on the other
    side leading up to the merge commit.  In very simple cases it would
    be nicer to show those, but except in projects that use semi-linear
    history that would risk displaying a lot of unrelated commits.
---
 lisp/magit-log.el | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index eaa77581c5..e6f9d27656 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -829,11 +829,8 @@ 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"
-                       (magit-git-string "merge-base" (concat m "^") commit)
-                       m))
-         args files nil commit)
+        (magit-log-setup-buffer (list (format "%s^1..%s" m m))
+                                args files nil commit)
       ;; Output: "<ref><lots of spaces><message>".
       ;; This is not the same as `string-trim'.
       (setq m (string-trim-left (substring m (string-match " " m))))