Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-10 Thread Duy Nguyen
On Fri, Jan 11, 2019 at 3:07 AM Stefan Beller wrote: > > > I had a look at > > https://gitlab.com/pclouds/git/commits/submodules-in-worktrees, > > and it doesn't seem to be quite all okay. > > > > The submodule update step of the repro (that breaks the config on 2.20) > > emits > > an error mess

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-10 Thread Stefan Beller
> I had a look at > https://gitlab.com/pclouds/git/commits/submodules-in-worktrees, > and it doesn't seem to be quite all okay. > > The submodule update step of the repro (that breaks the config on 2.20) emits > an error message instead, and leaves the config unchanged: >git -C b2 submodule up

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-09 Thread Tomasz Śniatowski
On Wed, 9 Jan 2019 at 18:42, Stefan Beller wrote: > > On Tue, Jan 8, 2019 at 2:16 PM Tomasz Śniatowski wrote: > > > > After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git > > will break the submodule configuration. Reproducible with: > > git init a && (cd a; touch a; g

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-09 Thread Stefan Beller
On Tue, Jan 8, 2019 at 2:16 PM Tomasz Śniatowski wrote: > > After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git > will break the submodule configuration. Reproducible with: > git init a && (cd a; touch a; git add a; git commit -ma) > git init b && (cd b; git submod

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-09 Thread Duy Nguyen
On Wed, Jan 9, 2019 at 1:40 PM Tomasz Śniatowski wrote: > > The good news is, I have something that should make it work reliably. > > But I don't know if it will make it to 2.21 or not. > > That's good to hear, is there something I can try out or track? You can try this https://gitlab.com/pcloud

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-08 Thread Tomasz Śniatowski
On Wed, 9 Jan 2019 at 00:23, Duy Nguyen wrote: > > On Wed, Jan 9, 2019 at 5:56 AM Tomasz Śniatowski wrote: > > > > After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git > > will break the submodule configuration. Reproducible with: > > git init a && (cd a; touch a; git

Re: Regression: submodule worktrees can clobber core.worktree config

2019-01-08 Thread Duy Nguyen
On Wed, Jan 9, 2019 at 5:56 AM Tomasz Śniatowski wrote: > > After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git > will break the submodule configuration. Reproducible with: > git init a && (cd a; touch a; git add a; git commit -ma) > git init b && (cd b; git submod

Regression: submodule worktrees can clobber core.worktree config

2019-01-08 Thread Tomasz Śniatowski
After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git will break the submodule configuration. Reproducible with: git init a && (cd a; touch a; git add a; git commit -ma) git init b && (cd b; git submodule add ../a; git commit -mb) git -C b worktree add ../b2 g