Re: [PATCH] rebase -i: redo tasks that die during cherry-pick

Phil Hord phil.h...@gmail.com writes: On Wed, Apr 29, 2015 at 1:15 PM, Junio C Hamano gits...@pobox.com wrote: Thanks, will queue. Aside from the much more invasive possibility, the patch makes me wonder if it would have been a better design to have a static todo with a current pointer as

Re: [PATCH] rebase -i: redo tasks that die during cherry-pick

On Wed, Apr 29, 2015 at 1:15 PM, Junio C Hamano gits...@pobox.com wrote: Thanks, will queue. Aside from the much more invasive possibility, the patch makes me wonder if it would have been a better design to have a static todo with a current pointer as two state files. Then reschedule would

[PATCH] rebase -i: redo tasks that die during cherry-pick

When rebase--interactive processes a task, it removes the item from the todo list and appends it to another list of executed tasks. If a pick (this includes squash and fixup) fails before the index has recorded the changes, take the corresponding item and put it on the todo list again. Otherwise,

Re: [PATCH] rebase -i: redo tasks that die during cherry-pick

Hi, On 2015-04-29 00:55, Phil Hord wrote: When rebase--interactive processes a task, it removes the item from the todo list and appends it to another list of executed tasks. If a pick (this includes squash and fixup) fails before the index has recorded the changes, take the corresponding item