Re: [PATCH 2/3] entry.c: checkout available submodules

From: Sven Verdoolaege <skimo@kotnet.org>
Date: May 25, 2007, 21:42 UTC
Message-ID: <20070525214205.GJ942MdfPADPa@greensroom.kotnet.org>
In-Reply-To: <20070525213103.GA8361@admingilde.org>

On Fri, May 25, 2007 at 11:31:03PM +0200, Martin Waitz wrote:

> I think the list tends to prefer subproject over submodule.

Does it? It seems that everyone writing code is use submodule instead of subproject. Either way, I don't really care.

Show 14 quoted lines

> > @@ -193,9 +220,8 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
> >  		 */
> >  		unlink(path);
> >  		if (S_ISDIR(st.st_mode)) {
> > -			/* If it is a gitlink, leave it alone! */
> >  			if (S_ISGITLINK(ntohl(ce->ce_mode)))
> > -				return 0;
> > +				return checkout_submodule(ce, path, state);
> >  			if (!state->force)
> >  				return error("%s is a directory", path);
> >  			remove_subtree(path);
> 
> I think the call to checkout_submodule should be moved to write_entry,
> to keep it in line with the other mode types.

Well, like your patch, this only deals with cases where the submodule is already available. In write_entry you could potentially clone submodules based on some criteria, but I'm not doing this just yet since some people apparently prefer to get these things in pieces.

Also, it seems that some people would like this to be a step that is separated from git-checkout (see Lars' patch).

skimo