Patchwork D8263: gitlog: fix embarassing bug that prevented log from showing correct parents

login
register
mail settings
Submitter phabricator
Date March 9, 2020, 10:03 a.m.
Message ID <b3e777a86a17f9d471252f0443c43325@localhost.localdomain>
Download mbox | patch
Permalink /patch/45629/
State Not Applicable
Headers show

Comments

phabricator - March 9, 2020, 10:03 a.m.
Closed by commit rHG559e31eabc3d: gitlog: fix embarassing bug that prevented log from showing correct parents (authored by durin42).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8263?vs=20612&id=20620

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8263/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8263

AFFECTED FILES
  hgext/git/gitlog.py

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/hgext/git/gitlog.py b/hgext/git/gitlog.py
--- a/hgext/git/gitlog.py
+++ b/hgext/git/gitlog.py
@@ -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.