Re: Confusing error message in rebase when commit becomes empty

From: Peter Krefting <peter@softwolves.pp.se>
Date: Jun 11, 2014, 17:57 UTC
Message-ID: <alpine.DEB.2.00.1406111854180.21431@ds9.cixit.se>
In-Reply-To: <CABURp0rC3yktDiRVQwo9E+x5_wKLnLVRx87ej+m+TyUdBkMpOA@mail.gmail.com>

Phil Hord:

> What does it mean when you say it worked as expected?  Did it leave
> the empty commit, omit the empty commit, or leave some un-squashed
> commit?

Actually, it did not work as expected I noted afterward, it just dropped the reversion commit, and did not squash the next commit into it as I had asked, so from three commits, "change", "revert", "new-change" I had two, "change", "new-change" with the end result being the same (i.e., instead of squashing all three into one "new-change", I had "change" and "revert" + "new-change").

> It's not clear to me what --continue _should_ do in this 
> case, but it does seem like the two options here should be

I sort of expect a squashed commit of "change" + "revert" to be an empty commit, and of "change" + "revert" + "new-change" to be a commit of "new-change".

-- 
\\// Peter - http://www.softwolves.pp.se/