Re: [BUG] rebase -i with only empty commits

2017-08-24 Thread Phillip Wood
On 23/08/17 15:40, Johannes Schindelin wrote: > > These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe > you want to do that, too? > > Ciao, > Dscho > This is slightly off topic but when I was preparing the patches for [1] I noticed a couple of potential bugs with rebase --

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Philip Oakley
From: "Johannes Schindelin" So the problem seems to be that rebase -i (like rebase without -i) considers "empty commits" as commits to be ignored. However, when using rebase -i one expects that you can include the empty commit... Also, the behavior is odd. When I only have empty commits, a "g

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Junio C Hamano
Stephan Beyer writes: > On 08/23/2017 07:29 PM, Stefan Beller wrote: >> On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: >>> On 08/23/2017 04:40 PM, Johannes Schindelin wrote: These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe you want to do that, too? >>> >

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Stephan Beyer
On 08/23/2017 07:29 PM, Stefan Beller wrote: > On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: >> On 08/23/2017 04:40 PM, Johannes Schindelin wrote: >>> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe >>> you want to do that, too? >> >> That's a very valuable hint,

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Stefan Beller
On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer wrote: > Hi, > > On 08/23/2017 04:40 PM, Johannes Schindelin wrote: >> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe >> you want to do that, too? > > That's a very valuable hint, thank you very much! While -k side steps th

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Stephan Beyer
Hi, On 08/23/2017 04:40 PM, Johannes Schindelin wrote: > These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe > you want to do that, too? That's a very valuable hint, thank you very much! Best Stephan

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Johannes Schindelin
Hi, On Wed, 23 Aug 2017, Stephan Beyer wrote: > On 08/23/2017 01:08 AM, Stefan Beller wrote: > > The editor opened proposing the following instruction sheet, > > which in my opinion is buggy: > > > > pick 1234 some commit > > exec make > > pick 2345 another commit > > exec make >

[BUG] rebase -i with only empty commits

2017-08-23 Thread Stephan Beyer
Hi, On 08/23/2017 01:08 AM, Stefan Beller wrote: > The editor opened proposing the following instruction sheet, > which in my opinion is buggy: > > pick 1234 some commit > exec make > pick 2345 another commit > exec make > pick 3456 third commit > # pick 4567 empty commit