On Tue, Jul 29, 2008 at 01:31:23PM +0000, Nigel Magnay wrote: > > I do not understand. We are talking about three different things here: > > > > 1) the committed state of the submodule > > 2) the local state of the submodule > > 3) the state of the "tracks" branch > > > > We always have 1) and we have 2) _iff_ the submodule was checked out. We > > only will have 3) if "tracks" is set in .git/config (for consistency's > > sake, we should not read that information directly from the .gitmodules > > file, but let the user override it in .git/config after "submodule init". > > > > I think the implication is that .gitconfig states "I'm expecting that > submodule X will always be tracking branch name 'Y'" and that you > wouldn't ever override it in .git/config. If you then switched > submodule X to branch Z, then committed the superproject, that commit > would contain a change to .gitconfig also (to say I'm expecting to > track Z rather than X') ? Yes, tracks branch in .git/config doesn't fly. Or you need a branch.$supermodule_branch.$submodule_name.tracks setting (oh god!)
Attachment:
pgpqo3phReunt.pgp
Description: PGP signature
