Re: git submodules implementation question
- From
- Uma Srinivasan <usrinivasan@twitter.com>
- Date
- Aug 31, 2016, 02:54 UTC
- Message-ID
- <CAN5XQfuoq6MV4e98RzUCG02KvZO6VZAbs1oxAzpdg5zswqpHGw@mail.gmail.com>
- In-Reply-To
- <xmqqzinu3zyw.fsf@gitster.mtv.corp.google.com>
On Tue, Aug 30, 2016 at 10:53 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 24 quoted lines
> Uma Srinivasan <usrinivasan@twitter.com> writes:
>
>> I think the following fix is still needed to is_submodule_modified():
>>
>> strbuf_addf(&buf, "%s/.git", path);
>> git_dir = read_gitfile(buf.buf);
>> if (!git_dir) {
>> git_dir = buf.buf;
>> ==> if (!is_git_directory(git_dir)) {
>> ==> die("Corrupted .git dir in submodule %s", path);
>> ==> }
>> }
>
> If it is so important that git_dir is a valid Git
> repository after
>
> git_dir = read_gitfile(buf.buf);
> if (!git_dir)
> git_dir = buf.buf;
>
> is done to determine what "git_dir" to use, it seems to me that it
> does not make much sense to check ONLY dir/.git that is a directory
> and leave .git/modules/$name that dir/.git file points at unchecked.
>Okay.
Show 11 quoted lines
> But there is much bigger problem with the above addition, I think.
> There also can be a case where dir/ does not even have ".git" in it.
> A submodule the user is not interested in will just have an empty
> directory there, and immediately after the above three lines I
> reproduced above, we have this
>
> if (!is_directory(git_dir)) {
> strbuf_release(&buf);
> return 0;
> }
>Good to know about this use case.
> The added check will break the use case. If anything, that check, > if this code needs to verify that "git_dir" points at a valid Git > repository, should come _after_ that.
Okay.
> > Shouldn't "git-status --porcelain" run in the submodule notice that > it is not a valid repository and quickly die anyway? Why should we > even check before spawning that process in the first place?
I don't see any reason to disagree with this.
Show 9 quoted lines
> > I might suggest to update prepare_submodule_repo_env() so that the > spawned process will *NOT* have to guess where the working tree and > repository by exporting GIT_DIR (set to "git_dir" we discover above) > and GIT_WORK_TREE (set to "." as cp.dir is set to the path to the > working tree of the submodule). That would stop the "git status" to > guess (and fooled by a corrupted dir/.git that is not a git > repository). >
Here's where I am struggling with my lack of knowledge of git internals and the implementation particularly in the context of how environment variables are passed from the parent to the child process.
Are you suggesting that we set up the child process environment array (the "out" argument) in prepare_submodule_repo_env() to include GIT_DIR_ENVIRONMENT and GIT_WORK_TREE_ENVIRONMENT in addition to CONFIG_DATA_ENVIRONMENT that is there now? Can I use the strcmp and argv_array_push() calls to do this? There are several callers for this routine prepare_submodule_repo_env(). Would the caller pass the git dir and work tree as arguments to this routine or would the caller set up the environment variables as needed? Is there any documentation or other example code where similar passing of env. vars to a child process is being done?
Sorry for all these questions but I'm still a novice as far as the code is concerned.
Thanks for your help.
Uma