On Mon, Jan 12, 2009 at 11:07, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Lars Hjemli <hjemli@xxxxxxxxx> writes:
>
>> On Mon, Jan 12, 2009 at 04:15, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> ...
>>> When the user explicitly asks you to traverse into submodules and the
>>> necessary commit is not available in a submodule, the code goes on without
>>> complaining. I am not saying it is bad, but I wonder if we would want to
>>> distinguish these three cases:
>>>
>>> (1) the submodule is initialized and the necessary commit is there.
>>>
>>> (2) the submodule is initialized, but the necessary commit is missing.
>>>
>>> (3) the submodule is not even initialized (aka "the user is not
>>> interested in it"); there is only an empty directory.
>>>
>>> I think it is perfectly fine not to say anything for (3) but I am unsure
>>> about the second case.
>>
>> Do we want to impose the porcelainish rules of git-submodule
>> (.gitmodules, .git/config) in read_tree_recursive()?
>>
>> If so, I guess a new submodule.h might provide something like this
>> (disclaimer: coded in gmail):
>
> I do not see why you would need anything more than we already have to tell
> (3) from (1) and (2). And I do not see why you need to have the Porcelain
> policy in the picture for telling these three cases apart, either.
>
> For example, there is this code in read-cache.c::ce_compare_gitlink():
>
> static int ce_compare_gitlink(struct cache_entry *ce)
> {
> unsigned char sha1[20];
>
> /*
> * We don't actually require that the .git directory
> * under GITLINK directory be a valid git directory. It
> * might even be missing (in case nobody populated that
> * sub-project).
> *
> * If so, we consider it always to match.
> */
> if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
> return 0;
> return hashcmp(sha1, ce->sha1);
> }
>
> It asks resolve_gitlink_ref() to see if the directory (where the submodule
> checkout _might_ be present if the user is interested in it) has .git/HEAD
> that resolves. If so, the user has a checkout and is interested in it.
> Otherwise, there is no checkout, in other words, we have case (3) above.
Ah, yes, this makes sense. Thanks.
> Whether you force the user to link the submodule object store to the
> primary one as alternates, or do that for the user temporarily inside the
> process [*1*],
If resolve_gitlink_ref() returns 0, I think we should automatically
insert the objectdir of the submodule as a tempory alternate.
> you would then be able to tell (1) and (2) apart by asking
> has_sha1_file() if you can see the commit.
Yes (I've also got a use-case for this with bare repositories [*1*],
but in that setting I guess it's ok to force the user to link the
alternates manually).
> One thing that is unclear is to me is for whom the commit is missing (or
> present). I think the outline I gave above follows the design of your
> patch to assume that the commit may (or may not) be available to the
> superproject and traverse into the commit when that is the case. It does
> not mean the commit is available to the submodule itself (the commit may
> have found in the primary project itself, not via the alternates), but
> such an arrangement makes it somewhat useless.
I think we can ignore this issue; if someone has added the
superproject as an alternate for the submodule and then done a
checkout of a superproject commit in the submodule followed by
committing this gitlink in the superproject, we can only hope the user
really knew what he was doing...
> What's the typical direction of using alternates in a setting with
> superproject with a submodule? Do people have alternates in the submodule
> repository that borrows from the superproject repository? Or the other
> way around? What's the rationale for having such alternates for normal
> use case? I am suspecting that there is no reason (other than this
> "recursive tree traversal") to have an alternates file in either
> direction,
Likewise.
> but I also strongly suspect that I am missing some unwritten
> assumption you are making.
I'm only assuming that we want to support traversal into the
submodules from core git.
*1* This will be (ab)used by cgit to support downloading of 'complete'
tarballs, as outlined in
http://thread.gmane.org/gmane.comp.version-control.git/102827.
--
larsh
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
