We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 89cdb07 commit 2610251Copy full SHA for 2610251
crates/gitbutler-repo/src/rebase.rs
@@ -242,18 +242,11 @@ fn extract_conflicted_files(
242
);
243
let (mut ancestor_entries, mut our_entries, mut their_entries) =
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 {
+ for entry in index.entries() {
+ let stage = entry.stage();
254
let storage = match stage {
255
Stage::Unconflicted => {
256
- unreachable!("BUG: filtered above to not contain unconflicted entries")
+ continue;
257
}
258
Stage::Base => &mut ancestor_entries,
259
Stage::Ours => &mut our_entries,
0 commit comments