pr-1492/phillipwood/rebase-dont-write-done-when-rescheduling-v1
tagged this
19 Mar 14:48
From: Phillip Wood <phillip.wood@dunelm.org.uk> As the sequencer executes todo commands it appends them to .git/rebase-merge/done. This file is used by "git status" to show the recently executed commands. Unfortunately when a command is rescheduled the command preceding it is erroneously appended to the "done" file. This means that when rebase stops after rescheduling "pick B" the "done" file contains pick A pick B pick A instead of pick A pick B Fix this by not updating the "done" file when adding a rescheduled command back into the "todo" file. A couple of the existing tests are modified to improve their coverage as none of them trigger this bug or check the "done" file. Note that the rescheduled command will still be appended to the "done" file again when it is successfully executed. Arguably it would be better not to do that but fixing it would be more involved. Reported-by: Stefan Haller <lists@haller-berlin.de> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Submitted-As: https://lore.kernel.org/git/pull.1492.git.1679237337683.gitgitgadget@gmail.com
Assets 2
-
2023-03-19T14:48:57Z -
2023-03-19T14:48:57Z - Loading