refactor todo file generation

1 files changed, 7 insertions, 7 deletions

diff --git a/pkg/commands/git_commands/patch.go b/pkg/commands/git_commands/patch.go
index 8f9ce5784..a805c7f21 100644
--- a/pkg/commands/git_commands/patch.go
+++ b/pkg/commands/git_commands/patch.go
@@ -105,16 +105,16 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 	}
 
 	baseIndex := sourceCommitIdx + 1
-	todo := ""
-	for i, commit := range commits[0:baseIndex] {
-		a := "pick"
+
+	todoLines := self.rebase.BuildTodoLines(commits[0:baseIndex], func(commit *models.Commit, i int) string {
 		if i == sourceCommitIdx || i == destinationCommitIdx {
-			a = "edit"
+			return "edit"
+		} else {
+			return "pick"
 		}
-		todo = a + " " + commit.Sha + " " + commit.Name + "\n" + todo
-	}
+	})
 
-	err := self.rebase.PrepareInteractiveRebaseCommand(commits[baseIndex].Sha, todo, true).Run()
+	err := self.rebase.PrepareInteractiveRebaseCommand(commits[baseIndex].Sha, todoLines, true).Run()
 	if err != nil {
 		return err
 	}