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 hvo...@hvoigt.net 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

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 hvo...@hvoigt.net 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.

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

2014-07-15 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net 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.

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 hvo...@hvoigt.net writes: On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: diff --git a/builtin/checkout.c b/builtin/checkout.c index 07cf555..03ea20d

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 hvo...@hvoigt.net 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-09 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net 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

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

2014-07-08 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net 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