branch | stable |
changeset 47051 | de26b9a7ec29 |
parent 46113 | 59fa3890d40a |
child 47057 | 7431f5ab0d2a |
--- a/hgext/git/index.py Tue Apr 27 17:54:08 2021 -0400 +++ b/hgext/git/index.py Tue Apr 27 18:39:59 2021 -0400 @@ -6,7 +6,6 @@ from mercurial.i18n import _ from mercurial.node import ( - nullhex, nullid, ) @@ -281,7 +280,7 @@ for pos, commit in enumerate(walker): if prog is not None: prog.update(pos) - p1 = p2 = nullhex + p1 = p2 = gitutil.nullgit if len(commit.parents) > 2: raise error.ProgrammingError( (