Re: Confusing error message in rebase when commit becomes empty

2014-06-13 Thread Peter Krefting
Phil Hord: Did you have a series of three commits being squashed in your to-do list? I mean, did you have a list like this: pick ... do foo squash ... revert do foo squash ... What I really meant to do. Yes, that is exactly what I had. Plus an extra commit that I moved to the end,

Re: Confusing error message in rebase when commit becomes empty

2014-06-13 Thread Jeff King
On Wed, Jun 11, 2014 at 01:49:04PM +0100, Peter Krefting wrote: Hi! I am rebasing a branch to combine a couple of commits. One is a revert of a previous commit. Since there are commits in-between, I do squash to make sure I get everything, and then add the actual change on top of that. The

Re: Confusing error message in rebase when commit becomes empty

2014-06-13 Thread Jeff King
On Fri, Jun 13, 2014 at 08:25:43AM +0100, Peter Krefting wrote: Yes, but empty commits are discouraged on some projects. If you want your change + revert = empty commit to appear after the squash, I would expect you would want to use --keep-empty on your inital rebase command. But I'm not

Confusing error message in rebase when commit becomes empty

2014-06-11 Thread Peter Krefting
Hi! I am rebasing a branch to combine a couple of commits. One is a revert of a previous commit. Since there are commits in-between, I do squash to make sure I get everything, and then add the actual change on top of that. The problem is that rebase stops with a confusing error message (from

Re: Confusing error message in rebase when commit becomes empty

2014-06-11 Thread Phil Hord
On Wed, Jun 11, 2014 at 8:49 AM, Peter Krefting pe...@softwolves.pp.se wrote: I am rebasing a branch to combine a couple of commits. One is a revert of a previous commit. Since there are commits in-between, I do squash to make sure I get everything, and then add the actual change on top of

Re: Confusing error message in rebase when commit becomes empty

2014-06-11 Thread Peter Krefting
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

Re: Confusing error message in rebase when commit becomes empty

2014-06-11 Thread Phil Hord
On Wed, Jun 11, 2014 at 1:57 PM, Peter Krefting pe...@softwolves.pp.se wrote: 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,