From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: Avery Pennarun's git-subtree? Date: Mon, 26 Jul 2010 09:41:42 -0700 Message-ID: References: <4C472B48.8050101@gmail.com> <4C4778DE.9090905@web.de> <4C49B31F.8000102@xiplink.com> <4C4DB9AC.9000306@xiplink.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Avery Pennarun , skillzero@gmail.com, Jakub Narebski , Jens Lehmann , =?ISO-8859-1?Q?=C6var_Arnfj=F6r=F0_Bjarmason?= , Bryan Larsen , git , Junio C Hamano To: Marc Branchaud X-From: git-owner@vger.kernel.org Mon Jul 26 18:42:18 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OdQkq-0000LB-4f for gcvg-git-2@lo.gmane.org; Mon, 26 Jul 2010 18:42:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754260Ab0GZQmK convert rfc822-to-quoted-printable (ORCPT ); Mon, 26 Jul 2010 12:42:10 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:34880 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753184Ab0GZQmJ convert rfc822-to-8bit (ORCPT ); Mon, 26 Jul 2010 12:42:09 -0400 Received: from mail-gx0-f174.google.com (mail-gx0-f174.google.com [209.85.161.174]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o6QGg774002509 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL) for ; Mon, 26 Jul 2010 09:42:08 -0700 Received: by gxk23 with SMTP id 23so898467gxk.19 for ; Mon, 26 Jul 2010 09:42:02 -0700 (PDT) Received: by 10.151.6.5 with SMTP id j5mr8985829ybi.235.1280162522207; Mon, 26 Jul 2010 09:42:02 -0700 (PDT) Received: by 10.151.142.21 with HTTP; Mon, 26 Jul 2010 09:41:42 -0700 (PDT) In-Reply-To: <4C4DB9AC.9000306@xiplink.com> X-Spam-Status: No, hits=-2.954 required=5 tests=AWL,BAYES_00 X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, Jul 26, 2010 at 9:37 AM, Marc Branchaud = wrote: > > I think I should mention one aspect of what we're doing, which is tha= t a lot > of our submodules are based on external code, and that we occasionall= y need > to modify or customize some of that code. =A0So it's quite nice for u= s to > maintain private git mirrors of the external repos, with our own priv= ate > branches that contain our modifications. =A0Although we want to get m= uch of our > changes incorporated into the upstream code bases, upstream release c= ycles > are rarely in sync with ours. THIS. This is why I always thought that submodules absolutely have to be commits, not trees. It's why the git submodule data structures are done the way they are. Anything that makes the submodule just a tree is fundamentally broken, I think. That said, I'm not competent to comment on the actual user interface issues. I can well believe that git-subtree has a nicer interface. Linus