From 9e802b47507f6fe527bc62efd56b510033df9d93 Mon Sep 17 00:00:00 2001 From: Sultan Alsawaf Date: Tue, 25 Nov 2025 15:46:04 -0800 Subject: [PATCH] [RI] Change the fuzz factor to 2 When a fuzz factor of 3 results in an incorrect patch application, the final interdiff output is harder to review than when the fuzz factor is 2. This is especially the case because it's common for rejected hunks from both files to appear back-to-back, making the rejected hunks easy to review. Turn down the fuzz factor to the default of 2 to avoid results that are very confusing. --- run_interdiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_interdiff.py b/run_interdiff.py index 49cad2f..3bf8ded 100755 --- a/run_interdiff.py +++ b/run_interdiff.py @@ -89,7 +89,7 @@ def run_interdiff(repo, backport_sha, upstream_sha, interdiff_path): up_path = up.name interdiff_result = subprocess.run( - [interdiff_path, "--fuzzy=3", bp_path, up_path], text=True, capture_output=True, check=False + [interdiff_path, "--fuzzy", bp_path, up_path], text=True, capture_output=True, check=False ) # Check for interdiff errors (non-zero return code other than 1)