From d5d69369a33ab55b3b89e0eea323f3cc0bb8db92 Mon Sep 17 00:00:00 2001 From: Cole Miller Date: Wed, 18 Feb 2026 20:16:04 -0500 Subject: [PATCH] git: Mitigate panic in split diff (#49546) Release Notes: - N/A --- crates/editor/src/split.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs index 8fbd264684efa070fafd1ff6d55d0f199d2dc626..5edb75a366f73336e8f63d8bba2b42be8ef30a22 100644 --- a/crates/editor/src/split.rs +++ b/crates/editor/src/split.rs @@ -225,10 +225,12 @@ where for (source_buffer, buffer_offset_range, source_excerpt_id, source_context_range) in source_snapshot.range_to_buffer_ranges_with_context(source_bounds) { - let target_excerpt_id = excerpt_map.get(&source_excerpt_id).copied().unwrap(); - let target_buffer = target_snapshot - .buffer_for_excerpt(target_excerpt_id) - .unwrap(); + let Some(target_excerpt_id) = excerpt_map.get(&source_excerpt_id).copied() else { + continue; + }; + let Some(target_buffer) = target_snapshot.buffer_for_excerpt(target_excerpt_id) else { + continue; + }; let buffer_id = source_buffer.remote_id();