Re: [PATCHv3 3/3] submodule-config: clarify parsing of null_sha1 element

2016-11-22 Thread Brandon Williams
On 11/21, Junio C Hamano wrote:
> Stefan Beller  writes:
> 
> > +Whenever a submodule configuration is parsed in 
> > `parse_submodule_config_option`
> > +via e.g. `gitmodules_config()`, it will be overwrite the null_sha1 entry.
> 
> It will overwrite?  It will be overwritten?  I guess it is the latter?
> 
> > +So in the normal case, when HEAD:.gitmodules is parsed first and then 
> > overlayed
> > +with the repository configuration, the null_sha1 entry contains the local
> > +configuration of a submodule (e.g. consolidated values from local git
> >  configuration and the .gitmodules file in the worktree).
> >  
> >  For an example usage see test-submodule-config.c.

I brought this up in v2, he must have just missed it for v3.

-- 
Brandon Williams


Re: [PATCHv3 3/3] submodule-config: clarify parsing of null_sha1 element

2016-11-21 Thread Junio C Hamano
Stefan Beller  writes:

> +Whenever a submodule configuration is parsed in 
> `parse_submodule_config_option`
> +via e.g. `gitmodules_config()`, it will be overwrite the null_sha1 entry.

It will overwrite?  It will be overwritten?  I guess it is the latter?

> +So in the normal case, when HEAD:.gitmodules is parsed first and then 
> overlayed
> +with the repository configuration, the null_sha1 entry contains the local
> +configuration of a submodule (e.g. consolidated values from local git
>  configuration and the .gitmodules file in the worktree).
>  
>  For an example usage see test-submodule-config.c.