From 0b0b2eefe0dfcfac86dbb6d1da62fa30a73f0768 Mon Sep 17 00:00:00 2001 From: okx-code Date: Sat, 17 Aug 2024 15:50:20 +0100 Subject: [PATCH] Also add to isUnfinishedPatch --- .../io/papermc/paperweight/tasks/patchremap/PatchApplier.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremap/PatchApplier.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremap/PatchApplier.kt index 74ec871b..8944f3f1 100644 --- a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremap/PatchApplier.kt +++ b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/patchremap/PatchApplier.kt @@ -114,7 +114,7 @@ class PatchApplier( } git("update-index", "--refresh").executeSilently() - if (git("diff-index", "--quiet", "HEAD", "--").runSilently() == 0) { + if (git("diff-index", "--diff-algorithm=myers", "--quiet", "HEAD", "--").runSilently() == 0) { return git("log", unmappedBranch, "-1", "--pretty=%B").getText().trim() != git("log", remappedBranch, "-1", "--pretty=%B").getText().trim() }