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 25
25
26
26
import typing
27
27
import warnings
28
- import weakref
29
28
from dataclasses import dataclass
30
29
31
30
# Import from pygit2
@@ -353,7 +352,6 @@ def diff_to_tree(
353
352
#
354
353
# Conflicts
355
354
#
356
- _conflicts = None
357
355
358
356
@property
359
357
def conflicts (self ):
@@ -375,15 +373,9 @@ def conflicts(self):
375
373
the particular conflict.
376
374
"""
377
375
if not C .git_index_has_conflicts (self ._index ):
378
- self ._conflicts = None
379
376
return None
380
377
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 )
387
379
388
380
389
381
@dataclass
You can’t perform that action at this time.
0 commit comments