diff --git a/Cargo.toml b/Cargo.toml
index 7635cd66..883ac10b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,6 +35,11 @@ std = []
 binary = ["dep:zlib-rs"]
 color = ["dep:anstyle"]
 
+[lints.clippy]
+# Suppressed pending a decision on the clippy 1.97 question_mark expansion,
+# which flags `let...else` blocks that are clearer left as-is.
+question_mark = "allow"
+
 [dependencies]
 hashbrown = { version = "0.17.0", default-features = false, features = ["default-hasher"] }
 anstyle = { version = "1.0.13", default-features = false, optional = true }
diff --git a/tests/compat/git/mod.rs b/tests/compat/git/mod.rs
index 51b7cd8b..91cb9a3c 100644
--- a/tests/compat/git/mod.rs
+++ b/tests/compat/git/mod.rs
@@ -135,7 +135,7 @@ fn fail_ambiguous_suffix_tie() {
         .expect_success(true)
         .expect_compat(false)
         .expect_external_error(snapbox::str![[r#"
-error: git diff header lacks filename information when removing 1 leading pathname component (line 4)
+error: git diff header lacks filename information when removing 1 leading pathname component at <stdin>:4
 
 "#]])
         .run();
@@ -186,7 +186,7 @@ fn fail_prefix_no_slash() {
         .expect_success(false)
         .expect_diffy_error(snapbox::str!["apply error: error applying hunk #1"])
         .expect_external_error(snapbox::str![[r#"
-error: git diff header lacks filename information when removing 1 leading pathname component (line 5)
+error: git diff header lacks filename information when removing 1 leading pathname component at <stdin>:5
 
 "#]])
         .run();
@@ -208,7 +208,7 @@ fn junk_between_hunks() {
         .strip(1)
         .expect_compat(false)
         .expect_external_error(snapbox::str![[r#"
-error: patch fragment without header at line 11: @@ -7,3 +7,3 @@
+error: patch fragment without header at <stdin>:11: @@ -7,3 +7,3 @@
 
 "#]])
         .run();
@@ -243,7 +243,7 @@ fn binary_literal_wrong_original() {
         .strip(1)
         .expect_compat(false)
         .expect_external_error(snapbox::str![[r#"
-error: corrupt binary patch at line 9: 
+error: corrupt binary patch at <stdin>:9: 
 error: No valid patches in input (allow with "--allow-empty")
 
 "#]])
@@ -261,7 +261,7 @@ fn binary_literal_size_mismatch() {
             "binary patch error: error parsing binary patch: decompressed size mismatch: expected 99, got 10"
         ]])
         .expect_external_error(snapbox::str![[r#"
-error: corrupt binary patch at line 7: 
+error: corrupt binary patch at <stdin>:7: 
 error: No valid patches in input (allow with "--allow-empty")
 
 "#]])