From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Martin Waitz Subject: Re: [RFC] Submodules in GIT Date: Fri, 1 Dec 2006 14:35:58 +0100 Message-ID: <20061201133558.GU18810@admingilde.org> References: <20061121223130.GA24909@nan92-1-81-57-214-146.fbx.proxad.net> <200611292000.23778.andyparkins@gmail.com> <20061130170625.GH18810@admingilde.org> <200612010902.51264.andyparkins@gmail.com> <20061201110032.GL18810@admingilde.org> <45701B8D.1030508@b-i-t.de> <20061201121234.GQ18810@admingilde.org> <4570289D.9050802@b-i-t.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3T2jnoiI0lx9XXvh" NNTP-Posting-Date: Fri, 1 Dec 2006 13:36:17 +0000 (UTC) Cc: git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org Content-Disposition: inline In-Reply-To: <4570289D.9050802@b-i-t.de> X-PGP-Fingerprint: B21B 5755 9684 5489 7577 001A 8FF1 1AC5 DFE8 0FB2 User-Agent: Mutt/1.5.9i Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gq8Yj-0006iV-FL for gcvg-git@gmane.org; Fri, 01 Dec 2006 14:36:09 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031336AbWLANgB (ORCPT ); Fri, 1 Dec 2006 08:36:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1031372AbWLANgA (ORCPT ); Fri, 1 Dec 2006 08:36:00 -0500 Received: from agent.admingilde.org ([213.95.21.5]:13452 "EHLO mail.admingilde.org") by vger.kernel.org with ESMTP id S1031336AbWLANf7 (ORCPT ); Fri, 1 Dec 2006 08:35:59 -0500 Received: from martin by mail.admingilde.org with local (Exim 4.50 #1) id 1Gq8YY-00066F-Tl; Fri, 01 Dec 2006 14:35:58 +0100 To: sf Sender: git-owner@vger.kernel.org --3T2jnoiI0lx9XXvh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable hoi :) On Fri, Dec 01, 2006 at 02:05:33PM +0100, sf wrote: > >On Fri, Dec 01, 2006 at 01:09:49PM +0100, sf wrote: > >>Martin Waitz wrote: > >>>So you not only store your submodule HEAD commit in the supermodule > >>>when you do commit to the supermodule, it also means that your > >>>submodule HEAD will be updated when you update your supermodule. > >> > >>Why the magic? The typical workflow in git is > >> > >>1. You work on a branch, i.e. edit and commit and so on. > >>2. At some point, you decide to share the work you did on that branch= =20 > >>(e-mail a patch, merge into another branch, push upstream or let it by= =20 > >>pulled by upstream) > > > >3. Other people want to use your new work. >=20 > Sorry, if that was not obvious: You actually procceed with one of the=20 > options I listed in Step 2. What I wanted to state is that with git you= =20 > do not mix up committing (which is local to your repository and your=20 > branch) and publishing. I guess you are refering to not mix up committing to the submodule and updating the supermodule index. These are really two separate steps, I just combined them above because I wanted to put emphasis on the other part: it is not a one-way flow, it is bidirectional, so your HEAD would have to changed if the supermodule gets updated. And I consider changing HEAD, without looking at the branch it points to, to be a bad thing. --=20 Martin Waitz --3T2jnoiI0lx9XXvh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFFcC++j/Eaxd/oD7IRAjYYAJ40w8EaSZAbawJU8jgu2UYla5/q6QCbBXS7 Z93/lisU70u0A/1iOa/+uDI= =ew5U -----END PGP SIGNATURE-----