Re: Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-17 Thread Junio C Hamano
On Thu, Jul 17, 2014 at 12:53 PM, Heiko Voigt wrote: > > On Tue, Jul 15, 2014 at 03:37:21PM -0700, Junio C Hamano wrote: > > Any other thing that still needs fixing in the series, or is it now > > ready for 'next'? > > All comments addressed. From my side it should be ready for next. Thanks; I am

Re: Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-17 Thread Heiko Voigt
On Tue, Jul 15, 2014 at 03:37:21PM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > >> Can there be any caller that include and use submodule-config.h that > >> does not need anythjing from submodule.h? Or vice versa? > >> > >> It just did not look like these two headers describe independ

Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-15 Thread Junio C Hamano
Heiko Voigt writes: >> Can there be any caller that include and use submodule-config.h that >> does not need anythjing from submodule.h? Or vice versa? >> >> It just did not look like these two headers describe independent >> subsystems but they almost always have to go hand-in-hand. And if >>

Re: Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-14 Thread Heiko Voigt
On Wed, Jul 09, 2014 at 03:04:50PM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote: > >> Heiko Voigt writes: > >> > >> > diff --git a/builtin/checkout.c b/builtin/checkout.c > >> > index 07cf555..03ea20d 100644 > >> > --- a

Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-09 Thread Junio C Hamano
Heiko Voigt writes: > On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote: >> Heiko Voigt writes: >> >> > diff --git a/builtin/checkout.c b/builtin/checkout.c >> > index 07cf555..03ea20d 100644 >> > --- a/builtin/checkout.c >> > +++ b/builtin/checkout.c >> > @@ -18,6 +18,7 @@ >> > #

Re: Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-09 Thread Heiko Voigt
On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > diff --git a/builtin/checkout.c b/builtin/checkout.c > > index 07cf555..03ea20d 100644 > > --- a/builtin/checkout.c > > +++ b/builtin/checkout.c > > @@ -18,6 +18,7 @@ > > #include "xdiff-interface.h" > >

Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-07-08 Thread Junio C Hamano
Heiko Voigt writes: > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 07cf555..03ea20d 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -18,6 +18,7 @@ > #include "xdiff-interface.h" > #include "ll-merge.h" > #include "resolve-undo.h" > +#include "submodule-config.

[PATCH v2 3/4] use new config API for worktree configurations of submodules

2014-06-28 Thread Heiko Voigt
We remove the extracted functions and directly parse into and read out of the cache. This allows us to have one unified way of accessing submodule configuration values specific to single submodules. Regardless whether we need to access a configuration from history or from the worktree. Signed-off-