--- a/hgext/git/dirstate.py	Fri Sep 27 11:57:42 2024 -0400
+++ b/hgext/git/dirstate.py	Fri Sep 27 12:05:48 2024 -0400
@@ -125,7 +125,7 @@
 
     def parents(self):
         # TODO how on earth do we find p2 if a merge is in flight?
-        return self.p1(), sha1nodeconstants.nullid
+        return [self.p1(), sha1nodeconstants.nullid]
 
     def __iter__(self):
         return (pycompat.fsencode(f.path) for f in self.git.index)