Re: Subprojects tasks

From: Martin Waitz <tali@admingilde.org>
Date: Dec 18, 2006, 07:44 UTC
Message-ID: <20061218074441.GJ12411@admingilde.org>
In-Reply-To: <200612180023.45815.Josef.Weidendorfer@gmx.de>

hoi :)

On Mon, Dec 18, 2006 at 12:23:45AM +0100, Josef Weidendorfer wrote:

Show 5 quoted lines

> I see that you always use "refs/heads/master" in the submodule.
> What happens if you do development in the submodule, create a new commit
> there, and want to switch supermodule branch afterwards?
> Wouldn't you lose your new work, as "refs/heads/master" has to be reset
> to another commit when you switch the supermodule branch?

It should behave the same as for files: Refuse to update the working directory if files (or the submodule here) are dirty. I guess this is not yet handled correctly by my prototype, but it should not be hard to do.

Show 6 quoted lines

> IMHO it would be nice to have refs in the submodule matching all the
> branches/tags of the supermodule.
> Meaning: "this is the commit which is used by branch/tag XYZ in the
> supermodule". This can be valuable information, and a "gitk --all" in
> the submodule would show you all the uses of your subproject in the
> scope of the given superproject.

I like the idea. Perhaps make them available similiar to the remotes information in refs/tracked/{heads,tags} or something.

> When switching branches in the supermodule, it simply would switch
> to the same name in submodules.

Nice idea, but I don't yet know how it really works out. It may be confusing to the user if he manually switches the branch in the submodule to another branch of the supermodule. Then he really is using one tracked branch, but not the currently tracked branch.

> Thus, this would allow to do bug fix commits for a submodule at all
> places where the supermodule has a branch, without the need to switch
> supermodule branches.

Hmm, but when switching to another supermodule branch it would try to update the submodule branch. And simply allow the current submodule branch to be a fast forward of the submodule version that the parent wants to set is a bad, as you would not be able to go back to an old supermodule version then.

Show 22 quoted lines

> > > Second, if you want to do some independent work on the module not related
> > > to work on submodule you should really clone (clone -l -s) submodule
> > > and work in separate checkout;
> > 
> > Yes.
> > But I really like the possibility to switch one module to a branch which
> > is not tracked by the parent, because it perhaps contains some debugging
> > code which is needed to debug some other submodule.  You can't move it
> > out because you need the common build infrastructure but you don't want
> > to branch the entire toplevel project because you don't want your
> > debugging changes to ever become visible at that level.
> 
> In general, I agree with not following submodule's HEAD for supermodule
> commits. As you cannot store any submodule branch names, this really
> would be confusing, as after switching to another supermodule branch
> and back again, the submodule branch name would reset to a given name
> ("master" in your current implementation).
> 
> But why wouldn't you create a temporary branch "debug_submodule1" in the
> supermodule for your use case? Branches are cheap with git, even in supermodules.
> Supermodule branches also are pure local, you never have to publish
> it somewhere, and can delete it afterwards.

Sure, you can of course always use supermodule branches. I just wanted to point out that it still is useful to have submodule branches which are independent from supermodule branches.

-- 
Martin Waitz