From 40b468e69e5dcad58ea916e8a2984c3aa62890e1 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 11 Feb 2026 07:55:51 -0500
Subject: [PATCH] git: Fix another `WrapPointCursor` panic in `spacer_blocks`
 (#48932)

Closes ZED-4ZH

Release Notes:

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

diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 3acef01f4445bf36fe3cef2a9ec65a5df304c142..a43c61c8617f34a8d396503e7392a306edf27929 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/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;