# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1583620960 18000
# Node ID f19491aae641a2f7e9d38e0cf06f5545bdb172b8
# Parent  7518ea76eff4900dbdacb4dd3bad1e021fa0acdd
gitlog: fix embarassing bug that prevented log from showing correct parents

We had the correct parents in the database, but the changelog was
always returning p1 for all parents. Oops.

Differential Revision: https://phab.mercurial-scm.org/D8263

diff -r 7518ea76eff4 -r f19491aae641 hgext/git/gitlog.py
--- a/hgext/git/gitlog.py	Sat Mar 07 16:51:21 2020 -0500
+++ b/hgext/git/gitlog.py	Sat Mar 07 17:42:40 2020 -0500
@@ -274,7 +274,7 @@
             if len(c.parents) > 2:
                 raise error.Abort(b'TODO octopus merge handling')
             if len(c.parents) == 2:
-                p2 = self.rev(c.parents[0].id.raw)
+                p2 = self.rev(c.parents[1].id.raw)
         return p1, p2
 
     # Private method is used at least by the tags code.