Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Stefan Beller
On Fri, Feb 5, 2016 at 12:33 PM, Jonathan Nieder wrote: > Stefan Beller wrote: >> On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: >>> Stefan Beller wrote: > +++ b/submodule-config.h @@ -14,6 +14,7 @@ struct submodule { + const char *update; >>> >>> gitmodules(5) tells me

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Jonathan Nieder
Stefan Beller wrote: > On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: >> Stefan Beller wrote: >>> +++ b/submodule-config.h >>> @@ -14,6 +14,7 @@ struct submodule { >>> + const char *update; >> >> gitmodules(5) tells me the only allowed values are checkout, rebase, >> merge, and none.

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Stefan Beller
On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: > Hi, > > It's been a while since I looked at this series. Hopefully I can > come at it with some fresh eyes. Thanks for your perseverance. > > Stefan Beller wrote: > >> We need the submodule update strategies in a later patch. > > This desc

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-04 Thread Jonathan Nieder
Hi, It's been a while since I looked at this series. Hopefully I can come at it with some fresh eyes. Thanks for your perseverance. Stefan Beller wrote: > We need the submodule update strategies in a later patch. This description doesn't explain what the patch will do or why parse_config didn

[PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-04 Thread Stefan Beller
We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule-config.c | 11 +++ submodule-config.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule-config.c b/submodule-config.c index afe0ea8..4239b0e