diff --git a/gix-diff/src/blob/platform.rs b/gix-diff/src/blob/platform.rs index 1907319b54d..b7b723eccc7 100644 --- a/gix-diff/src/blob/platform.rs +++ b/gix-diff/src/blob/platform.rs @@ -243,8 +243,8 @@ pub mod prepare_diff { /// Use it in [`Platform::prepare_diff_command`](super::Platform::prepare_diff_command()) to easily prepare a compatible invocation. command: &'a BStr, }, - /// One of the involved resources, [`old`](Outcome::old) or [`new`](Outcome::new), were binary and thus no diff - /// cannot be performed. + /// One of the involved resources, [`old`](Outcome::old) or [`new`](Outcome::new), was binary and thus no diff + /// can be performed. SourceOrDestinationIsBinary, } diff --git a/gix-diff/tests/diff/blob/slider.rs b/gix-diff/tests/diff/blob/slider.rs index b43f7b8f0ff..ed3c657dff4 100644 --- a/gix-diff/tests/diff/blob/slider.rs +++ b/gix-diff/tests/diff/blob/slider.rs @@ -213,7 +213,13 @@ mod baseline { hunk_lines.extend_from_slice(line); hunk_lines.push(b'\n'); } - _ => unreachable!("BUG: expecting unified diff format"), + b'\\' => { + assert_eq!(line, "\\ No newline at end of file".as_bytes()); + } + _ => unreachable!( + "BUG: expecting unified diff format, found line: `{}`", + line.to_str_lossy() + ), } match self.lines.peek() { diff --git a/tests/it/src/args.rs b/tests/it/src/args.rs index cad0be3bb04..4459a1c11b1 100644 --- a/tests/it/src/args.rs +++ b/tests/it/src/args.rs @@ -159,7 +159,7 @@ pub enum Subcommands { /// platforms (at least Windows) do not have such permissions, but Git still represents them. /// /// This currently only checks files name with an `.sh` suffix, and only operates on the - /// current repository. Its main use is checking that fixture scripts are have correct modes. + /// current repository. Its main use is checking that fixture scripts have correct modes. #[clap(visible_alias = "cm")] CheckMode {}, /// Print environment variables as `NAME=value` lines.