Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-06 Thread Orgad Shaneh
On Mon, Nov 6, 2017 at 8:37 PM, Brandon Williams wrote: > After reading your bug report and the fact that you weren't able to > reproduce it outside of your project I think i figured out what is > happening. Before ff6f1f564c the gitmodules file wasn't being loaded > unless a

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-06 Thread Brandon Williams
On 11/05, Orgad Shaneh wrote: > On Sat, Nov 4, 2017 at 8:04 PM, Orgad Shaneh wrote: > > On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin > > wrote: > >> Hi Orgad, > >> > >> On Fri, 3 Nov 2017, Johannes Schindelin wrote: > >> > >>> On Thu, 2 Nov

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-05 Thread Orgad Shaneh
On Sat, Nov 4, 2017 at 8:04 PM, Orgad Shaneh wrote: > On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin > wrote: >> Hi Orgad, >> >> On Fri, 3 Nov 2017, Johannes Schindelin wrote: >> >>> On Thu, 2 Nov 2017, Orgad Shaneh wrote: >>> >>> > I can't

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-04 Thread Orgad Shaneh
On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin wrote: > Hi Orgad, > > On Fri, 3 Nov 2017, Johannes Schindelin wrote: > >> On Thu, 2 Nov 2017, Orgad Shaneh wrote: >> >> > I can't reproduce this with a minimal example, but it happens in my >> > project. > > Whoa, I

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-03 Thread Johannes Schindelin
Hi Orgad, On Fri, 3 Nov 2017, Johannes Schindelin wrote: > On Thu, 2 Nov 2017, Orgad Shaneh wrote: > > > I can't reproduce this with a minimal example, but it happens in my project. Whoa, I somehow overlooked the "can't". Sorry. > > What I tried to do for reproducing is: > > rm -rf super sub

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-03 Thread Johannes Schindelin
Hi Orgad, On Thu, 2 Nov 2017, Orgad Shaneh wrote: > I can't reproduce this with a minimal example, but it happens in my project. > > What I tried to do for reproducing is: > rm -rf super sub > mkdir sub; cd sub; git init > git commit --allow-empty -m 'Initial commit' > mkdir ../super; cd

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-02 Thread Orgad Shaneh
On Thu, Nov 2, 2017 at 8:34 PM, Stefan Beller wrote: > On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh wrote: >> I can't reproduce this with a minimal example, but it happens in my project. >> >> What I tried to do for reproducing is: >> rm -rf super sub >>

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-02 Thread Stefan Beller
On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh wrote: > I can't reproduce this with a minimal example, but it happens in my project. > > What I tried to do for reproducing is: > rm -rf super sub > mkdir sub; cd sub; git init > git commit --allow-empty -m 'Initial commit' > mkdir

Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-02 Thread Orgad Shaneh
I can't reproduce this with a minimal example, but it happens in my project. What I tried to do for reproducing is: rm -rf super sub mkdir sub; cd sub; git init git commit --allow-empty -m 'Initial commit' mkdir ../super; cd ../super git init git submodule add ../sub touch foo; git add foo sub