On Sat, Apr 21, 2018 at 12:34 AM, Johannes Schindelin <johannes.schindelin@xxxxxx> wrote: > Eric Sunshine pointed out that I had such a commit message in > https://public-inbox.org/git/CAPig+cRrS0_nYJJY=O6cboV630sNQHPV5QGrQdD8MW-sYzNFGQ@xxxxxxxxxxxxxx/ > and I went on a hunt to figure out how the heck this happened. > > Turns out that if there is a fixup/squash chain where the *last* command > fails with merge conflicts, and we either --skip ahead or resolve the > conflict to a clean tree and then --continue, our code does not do a > final cleanup. > > Contrary to my initial gut feeling, this bug was not introduced by my > rewrite in C of the core parts of rebase -i, but it looks to me as if > that bug was with us for a very long time (at least the --skip part). > > The developer (read: user of rebase -i) in me says that we would want to > fast-track this, but the author of rebase -i in me says that we should > be cautious and cook this in `next` for a while. I looked through the patches again and think this series is good to go. Thanks, Stefan
