File tree Expand file tree Collapse file tree 1 file changed +1
-9
lines changed
Expand file tree Collapse file tree 1 file changed +1
-9
lines changed Original file line number Diff line number Diff line change 2525
2626import typing
2727import warnings
28- import weakref
2928from dataclasses import dataclass
3029
3130# Import from pygit2
@@ -353,7 +352,6 @@ def diff_to_tree(
353352 #
354353 # Conflicts
355354 #
356- _conflicts = None
357355
358356 @property
359357 def conflicts (self ):
@@ -375,15 +373,9 @@ def conflicts(self):
375373 the particular conflict.
376374 """
377375 if not C .git_index_has_conflicts (self ._index ):
378- self ._conflicts = None
379376 return None
380377
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 ()
378+ return ConflictCollection (self )
387379
388380
389381@dataclass
You can’t perform that action at this time.
0 commit comments