git: Fix another `WrapPointCursor` panic in `spacer_blocks` (#48932)

Cole Miller created 1 month ago

Closes ZED-4ZH

Release Notes:

- N/A

Change summary

crates/editor/src/display_map/block_map.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

crates/editor/src/display_map/block_map.rs

@@ -1314,7 +1314,8 @@ impl BlockMap {
                 (first_point, edit_for_first_point.new.start)
             };
             let our_baseline = our_wrapper(our_baseline);
-            let their_baseline = companion_wrapper(their_baseline);
+            let their_baseline =
+                companion_wrapper(their_baseline.min(excerpt.target_excerpt_range.end));
 
             let mut delta = their_baseline.0 as i32 - our_baseline.0 as i32;