File tree Expand file tree Collapse file tree 1 file changed +3
-10
lines changed
crates/gitbutler-repo/src Expand file tree Collapse file tree 1 file changed +3
-10
lines changed Original file line number Diff line number Diff line change @@ -242,18 +242,11 @@ fn extract_conflicted_files(
242
242
) ;
243
243
let ( mut ancestor_entries, mut our_entries, mut their_entries) =
244
244
( Vec :: new ( ) , Vec :: new ( ) , Vec :: new ( ) ) ;
245
- let conflicting_entries = index. entries ( ) . iter ( ) . filter_map ( |e| {
246
- let stage = e. stage ( ) ;
247
- if stage == gix:: index:: entry:: Stage :: Unconflicted {
248
- None
249
- } else {
250
- Some ( ( stage, e) )
251
- }
252
- } ) ;
253
- for ( stage, entry) in conflicting_entries {
245
+ for entry in index. entries ( ) {
246
+ let stage = entry. stage ( ) ;
254
247
let storage = match stage {
255
248
Stage :: Unconflicted => {
256
- unreachable ! ( "BUG: filtered above to not contain unconflicted entries" )
249
+ continue ;
257
250
}
258
251
Stage :: Base => & mut ancestor_entries,
259
252
Stage :: Ours => & mut our_entries,
You can’t perform that action at this time.
0 commit comments