We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 81cdaf0 commit 59bda2eCopy full SHA for 59bda2e
1 file changed
pygit2/index.py
@@ -25,7 +25,6 @@
25
26
import typing
27
import warnings
28
-import weakref
29
from dataclasses import dataclass
30
31
# Import from pygit2
@@ -353,7 +352,6 @@ def diff_to_tree(
353
352
#
354
# Conflicts
355
356
- _conflicts = None
357
358
@property
359
def conflicts(self):
@@ -375,15 +373,9 @@ def conflicts(self):
375
373
the particular conflict.
376
374
"""
377
if not C.git_index_has_conflicts(self._index):
378
- self._conflicts = None
379
return None
380
381
- if self._conflicts is None or self._conflicts() is None:
382
- conflicts = ConflictCollection(self)
383
- self._conflicts = weakref.ref(conflicts)
384
- return conflicts
385
-
386
- return self._conflicts()
+ return ConflictCollection(self)
387
388
389
@dataclass
0 commit comments