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: Carl Worth Subject: Re: Cleaning up git user-interface warts Date: Thu, 16 Nov 2006 08:37:43 -0800 Message-ID: <87fycjs5yg.wl%cworth@cworth.org> References: <200611151858.51833.andyparkins@gmail.com> <87velgs9hx.wl%cworth@cworth.org> <87psbos4pb.wl%cworth@cworth.org> <20061115230252.GH24861@spearce.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Thu_Nov_16_08:37:35_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Thu, 16 Nov 2006 16:38:45 +0000 (UTC) Cc: Shawn Pearce , Nicolas Pitre , "Michael K. Edwards" , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) 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 1GkkFd-00071t-8L for gcvg-git@gmane.org; Thu, 16 Nov 2006 17:38:09 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031181AbWKPQiE (ORCPT ); Thu, 16 Nov 2006 11:38:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1031187AbWKPQiE (ORCPT ); Thu, 16 Nov 2006 11:38:04 -0500 Received: from theworths.org ([217.160.253.102]:18102 "EHLO theworths.org") by vger.kernel.org with ESMTP id S1031181AbWKPQiC (ORCPT ); Thu, 16 Nov 2006 11:38:02 -0500 Received: (qmail 9815 invoked from network); 16 Nov 2006 11:38:00 -0500 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 16 Nov 2006 11:38:00 -0500 To: Linus Torvalds Sender: git-owner@vger.kernel.org --pgp-sign-Multipart_Thu_Nov_16_08:37:35_2006-1 Content-Type: text/plain; charset=US-ASCII On Wed, 15 Nov 2006 15:33:43 -0800 (PST), Linus Torvalds wrote: > It's a lot more useful to have a merge message like > > Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 > > than one like > > Merge branch 'for-linus' There's more information in the first, sure. But I absolutely don't accept that it's necessarily more useful, and definitely not that this is a good argument for using pull with a remote branch instead of fetch followed by merge with a local branch. First, the pull may just fast-forward in which case there's no message at all. And we've been through that topic enough recently that we all know that no important information is lost by not doing any separate recording in that case. So you can't turn around and argue that the remote URL information is suddenly important when it just so happens that it's not a fast forward. > And in a truly distributed situation, "pull" is strictly more powerful > than a separate "fetch" + separate "merge". I don't buy it. In my usage, I have several different remote repositories I'm interested in tracking, each with any number of branches. What I really want is an easy command that fetches all of those branches, (even new ones that I've never heard about---but never any of their "tracking branches" that wouldn't be of interest to me). And I want to do that once, to get the online-access-required part over with and get all the data into my local repository where I can start working with it. As for the URL from which I'm fetching all this stuff, it's really not interesting to me at all. The URL for "Keith's stuff" keeps changing anyway---I have no interest in recording that. But I do think it's worth recording that the commits came from Keith's repository. I do that right now with a keith/ prefix for his branches. It could also be done by bringing in his .git/description during the fetch and storing it somewhere. But I honestly don't see how storing something like that during would make the system any less distributed in any sense. -Carl --pgp-sign-Multipart_Thu_Nov_16_08:37:35_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFXJPX6JDdNq8qSWgRAsE3AJwI7r9R8rCAZLfBJEvWTslYunXubwCeP/EG LF+nqDfS5zbUYwk8cNQisAU= =wISt -----END PGP SIGNATURE-----