# HG changeset patch
# User Connor Sheehan <sheehan@mozilla.com>
# Date 1600779969 14400
# Node ID 73a5aa5e1857d320b863180b686229333632fd36
# Parent  89f0d9f87701cb953dfa48b8deb456fa7a97e1a8
git: pass `id` attribute of `pygit2.Tree` object

`pygit2`'s Repository object expects an instance of `Oid`
to return the corresponding object, instead of the object
itself.

After this change and D9062, `hg commit -i` seems to work,
unless it hits a case folding assertion (ie trying to add
a file like `README.md`).

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

diff -r 89f0d9f87701 -r 73a5aa5e1857 hgext/git/manifest.py
--- a/hgext/git/manifest.py	Wed Sep 16 12:13:46 2020 -0700
+++ b/hgext/git/manifest.py	Tue Sep 22 09:06:09 2020 -0400
@@ -322,7 +322,8 @@
             for part in comps:
                 parent = trees[full]
                 try:
-                    new = self._repo[parent[pycompat.fsdecode(part)]]
+                    parent_tree_id = parent[pycompat.fsdecode(part)].id
+                    new = self._repo[parent_tree_id]
                 except KeyError:
                     # new directory
                     new = None