5 commits

Author	SHA1	Message	Date
Jesse Duffield	e63858215e	refactor moveFixupCommitDown	2023-04-29 07:28:33 +02:00
Stefan Haller	3fe4db9316	Make RebaseCommands.AmendTo more robust ... This fixes two problems with the "amend commit with staged changes" command: 1. Amending to a fixup commit didn't work (this would create a commmit with the title "fixup! fixup! original title" and keep that at the top of the branch) 2. Unrelated fixup commits would be squashed too. The added integration test verifies that both of these problems are fixed.	2023-04-29 07:28:33 +02:00
Stefan Haller	a8586ba57e	Refactor: simplify PrepareInteractiveRebaseCommand API ... Instead of passing a bunch of different options in PrepareInteractiveRebaseCommandOpts, where it was unclear how they interact if several are set, have only a single field "instruction" which can be set to one of various different instructions. The functionality of replacing the entire todo file with our own is no longer available; it is only possible to prepend todos to the existing file. Also, instead of using different env vars for the various rebase operations that we want to tell the daemon to do, use a single one that contains a json-encoded struct with all available instructions. This makes the protocol much clearer, and makes it easier to extend in the future.	2023-04-29 07:28:33 +02:00
Stefan Haller	ab25600ccb	Extract EditRebaseTodo into a function in utils.rebaseTodo ... We want to reuse it from the daemon code in the next commit.	2023-04-29 07:28:33 +02:00
Jesse Duffield	aec46942a8	enforce lowercase filenames	2023-04-29 13:05:05 +10:00

Renamed from pkg/utils/rebaseTodo.go (Browse further)