Skip to content

Commit 0f5d99f

Browse files
committed
[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.
1 parent ddcdc4a commit 0f5d99f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

run_interdiff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def run_interdiff(repo, backport_sha, upstream_sha, interdiff_path):
8989
up_path = up.name
9090

9191
interdiff_result = subprocess.run(
92-
[interdiff_path, "--fuzzy=3", bp_path, up_path], text=True, capture_output=True, check=False
92+
[interdiff_path, "--fuzzy", bp_path, up_path], text=True, capture_output=True, check=False
9393
)
9494

9595
# Check for interdiff errors (non-zero return code other than 1)

0 commit comments

Comments
 (0)