Re: [RFC v3 3/4] submodule: Teach 'add' about a configurable local-branch

From: W. Trevor King <wking@tremily.us>
Date: Jan 15, 2014, 01:02 UTC
Message-ID: <20140115010208.GF2647@odin.tremily.us>
In-Reply-To: <CALas-iiLQHVpH9-KbWHVJzYSho3cV-ELmG4+R_8XGT7Pb+=gWQ@mail.gmail.com>

On Wed, Jan 15, 2014 at 01:18:12AM +0100, Francesco Pretto wrote:

> I've matured this opinion about "local-branch" some days ago, but I
> couldn't join the discussion because I was extremely busy. Hope it's
> is still current (and correct).

I think the discussion is still open, but actions are postponed until 'checkout --recurse-submodules' lands [1].

> The "local-branch" feature means to my brain the following: I,
> maintainer, decide for you, developer, what name should be the
> branch you are checking out.

The goal is to have “I, your faithful Git command, check out for you, oh wise developer, the superproject branch you requested, along with the local submodule branch associated with that super project branch.” ;) Maybe that would be more clear if the localBranch settings are purely local (stored only in out-of-tree configs), and not contained in the superproject's .gitmodules file? As this series stands, that would just drop step 3 from the lookup chain [2]. That step is below all the local out-of-tree locations though, and I see no non-psychological reason to keep folks from sharing reasonable default names for local branches.

Cheers, Trevor

[1]: http://article.gmane.org/gmane.comp.version-control.git/240420 [2]: http://article.gmane.org/gmane.comp.version-control.git/240251

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy