lint

Author: MiniDigger

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/RebuildFilePatches.kt

@@ -157,8 +157,12 @@ abstract class RebuildFilePatches : BaseTask() {
                 // todo detect if sed is not present (windows) and switch out sed for something else
                 @Language("Shell Script")
                 val sequenceEditor = "sed -i -e 0,/pick/{s/pick/drop/}"
-                val execs = filesWithNewAts.map { it -> "sed -i -e 's|// Paper-AT:.*||g' $it && ((git add $it && git commit --amend --no-edit) || true)" }.flatMap { listOf("--exec", it) }.toTypedArray()
-                git.withEnv(mapOf("GIT_SEQUENCE_EDITOR" to sequenceEditor))("rebase", "-i", "file", "--strategy-option=theirs", *execs).executeSilently()
+                val execs = filesWithNewAts
+                    .map { "sed -i -e 's|// Paper-AT:.*||g' $it && ((git add $it && git commit --amend --no-edit) || true)" }
+                    .flatMap { listOf("--exec", it) }.toTypedArray()
+                git.withEnv(
+                    mapOf("GIT_SEQUENCE_EDITOR" to sequenceEditor)
+                )("rebase", "-i", "file", "--strategy-option=theirs", *execs).executeSilently()
             } catch (e: Exception) {
                 // TODO better message to inform the user on what to do
                 throw RuntimeException("Encountered conflicts while rebuilding file patches.", e)