diff --git a/crates/radicle-cli/src/commands/id.rs b/crates/radicle-cli/src/commands/id.rs index 9ff38f2bb..845c9bc29 100644 --- a/crates/radicle-cli/src/commands/id.rs +++ b/crates/radicle-cli/src/commands/id.rs @@ -606,7 +606,21 @@ fn print_diff( }; let current = radicle::git::write_tree(&doc::PATH, current.as_bytes(), &repo)?; let mut opts = radicle::git::raw::DiffOptions::new(); - opts.context_lines(u32::MAX); + + { + #[cfg(not(windows))] + const CONTEXT_LINES: u32 = u32::MAX; + + // `xdiff`, which is commonly used on Windows, stores the number of + // context lines as a signed integer and doubles the value when + // merging hunks. Avoid overflow. See also: + // - + // - + #[cfg(windows)] + const CONTEXT_LINES: u32 = (i32::MAX / 2) as u32; + + opts.context_lines(CONTEXT_LINES); + } let diff = repo.diff_tree_to_tree(previous.as_ref(), Some(¤t), Some(&mut opts))?; let diff = Diff::try_from(diff)?;