From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH] better git-submodule status output Date: Mon, 7 Jul 2008 16:23:02 +0100 (BST) Message-ID: References: <20080701150119.GE5852@joyeux> <7vhcb3o7q3.fsf@gitster.siamese.dyndns.org> <20080706160758.GA23385@jhaampe.org> <20080707062142.GA5506@jhaampe.org> <32541b130807070725p6fa4d0dfne9f04bc857920dc7@mail.gmail.com> <32541b130807070757s4ba03e28tf4701f479e27b687@mail.gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Sylvain Joyeux , Junio C Hamano , Lars Hjemli , Ping Yin , Mark Levedahl , git@vger.kernel.org To: Avery Pennarun X-From: git-owner@vger.kernel.org Mon Jul 07 17:26:15 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KFsbE-0005im-7y for gcvg-git-2@gmane.org; Mon, 07 Jul 2008 17:25:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753620AbYGGPY6 (ORCPT ); Mon, 7 Jul 2008 11:24:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753595AbYGGPY6 (ORCPT ); Mon, 7 Jul 2008 11:24:58 -0400 Received: from mail.gmx.net ([213.165.64.20]:56390 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753290AbYGGPY5 (ORCPT ); Mon, 7 Jul 2008 11:24:57 -0400 Received: (qmail invoked by alias); 07 Jul 2008 15:24:56 -0000 Received: from grape.st-and.ac.uk (EHLO grape.st-and.ac.uk) [138.251.155.28] by mail.gmx.net (mp035) with SMTP; 07 Jul 2008 17:24:56 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX18MR8kox7MMw5VD1PiXpj093KtkpnXCzIIPjIB+UK YZFdovFzCPEjPA X-X-Sender: gene099@racer In-Reply-To: <32541b130807070757s4ba03e28tf4701f479e27b687@mail.gmail.com> User-Agent: Alpine 1.00 (DEB 882 2007-12-20) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.71 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Mon, 7 Jul 2008, Avery Pennarun wrote: > On 7/7/08, Johannes Schindelin wrote: > > On Mon, 7 Jul 2008, Avery Pennarun wrote: > > > Thus, I'd say the best fix would be to find a way to have "git pull" or > > > "git fetch" in the supermodule also do a fetch in the submodule. > > > > Noooooo! > > > > If I am actively working on the submodule, the supermodule has _no > > business_ trying to wreck my state. > > Hmm... how does doing a fetch wreck your state? It updates the tracking branches. And guess what I use the tracking branches for? Yes, to track other people's changes. It would wreck my state. Anyway, fetch is wrong, wrong, wrong, if all you want to do is see the _state_ of your submodule. If that state is that the superproject has a commit that the submodule knows nothing about, then that is _exactly_ what needs to be reported. Don't play cute games, Dscho