From: Pierre Habouzit <madcoder@debian.org>
To: Nigel Magnay <nigel.magnay@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Petr Baudis <pasky@suse.cz>,
Benjamin Collins <aggieben@gmail.com>,
Avery Pennarun <apenwarr@gmail.com>, Git ML <git@vger.kernel.org>
Subject: Re: git submodules
Date: Tue, 29 Jul 2008 16:49:14 +0200 [thread overview]
Message-ID: <20080729144914.GI32312@artemis.madism.org> (raw)
In-Reply-To: <320075ff0807290631l1f9a1e70jcb73bde7e2c86000@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]
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 #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-29 14:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 16:20 git submodules Pierre Habouzit
2008-07-28 16:23 ` Pierre Habouzit
2008-07-28 20:23 ` Nigel Magnay
2008-07-28 20:55 ` Pierre Habouzit
2008-07-28 20:59 ` Pierre Habouzit
2008-07-28 21:40 ` Avery Pennarun
2008-07-28 22:03 ` Pierre Habouzit
2008-07-28 22:26 ` Jakub Narebski
2008-07-28 22:41 ` Junio C Hamano
2008-08-17 20:13 ` Pierre Habouzit
2008-08-17 22:54 ` Avery Pennarun
2008-08-17 23:08 ` Junio C Hamano
2008-08-18 0:46 ` Pierre Habouzit
2008-07-28 22:32 ` Avery Pennarun
2008-07-28 23:12 ` Pierre Habouzit
2008-07-29 5:51 ` Benjamin Collins
2008-07-29 6:04 ` Shawn O. Pearce
2008-07-29 8:18 ` Nigel Magnay
2008-07-29 8:45 ` Pierre Habouzit
2008-07-29 8:21 ` Pierre Habouzit
2008-07-29 8:37 ` Pierre Habouzit
2008-07-29 8:51 ` Petr Baudis
2008-07-29 12:15 ` Johannes Schindelin
2008-07-29 13:07 ` Pierre Habouzit
2008-07-29 13:15 ` Johannes Schindelin
2008-07-29 13:19 ` Pierre Habouzit
2008-07-29 13:31 ` Nigel Magnay
2008-07-29 14:49 ` Pierre Habouzit [this message]
2008-07-29 14:53 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2009-10-17 17:15 Steven Noonan
2009-10-17 17:27 ` Jakub Narebski
2009-10-17 22:30 ` Nanako Shiraishi
2009-10-21 19:38 ` Avery Pennarun
2008-04-28 19:50 Victor Bogado da Silva Lins
2008-04-28 21:01 ` Miklos Vajna
[not found] <s5hwspjzbt0.wl%tiwai@suse.de>
[not found] ` <Pine.LNX.4.61.0802061437190.8113@tm8103.perex-int.cz>
[not found] ` <Pine.LNX.4.61.0802061505470.8113@tm8103.perex-int.cz>
[not found] ` <47AA1361.7070201@keyaccess.nl>
[not found] ` <s5h7ihhknez.wl%tiwai@suse.de>
2008-02-07 21:24 ` GIT submodules Rene Herman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080729144914.GI32312@artemis.madism.org \
--to=madcoder@debian.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=aggieben@gmail.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=nigel.magnay@gmail.com \
--cc=pasky@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).