let fixup helpers add the files to the index

PaperMC · Nov 1, 2024 · 4a1bd14 · 4a1bd14
1 parent db4e833
commit 4a1bd14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/FixupFilePatches.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/FixupFilePatches.kt
@@ -38,6 +38,7 @@ abstract class FixupFilePatches : BaseTask() {
     @TaskAction
     fun run() {
         val git = Git(repo)
+        git("commit", "add", ".").executeOut()
         git("commit", "--fixup", "file").executeOut()
         git("-c", "sequence.editor=:", "rebase", "-i", "--autosquash", "mache/main").executeOut()
     }

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/SetupPaperScript.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/SetupPaperScript.kt
@@ -72,6 +72,7 @@ abstract class SetupPaperScript : BaseTask() {
                 "Puts the current source changes into the file patches commit",
                 listOf(
                     "cd %root%/paper-server/src/vanilla/java",
+                    "git add .",
                     "git commit --fixup file",
                     "git -c sequence.editor=: rebase -i --autosquash mache/main"
                 )
@@ -82,6 +83,7 @@ abstract class SetupPaperScript : BaseTask() {
                 "Puts the current resource changes into the file patches commit",
                 listOf(
                     "cd %root%/paper-server/src/vanilla/resources",
+                    "git add .",
                     "git commit --fixup file",
                     "git -c sequence.editor=: rebase -i --autosquash mache/main"
                 )