From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: Dangers of working on a tracking branch Date: Thu, 15 Feb 2007 16:58:16 -0500 Message-ID: <20070215215816.GA3757@coredump.intra.peff.net> References: <17876.51013.561979.431717@lisa.zopyra.com> <17876.52962.662946.582507@lisa.zopyra.com> <17876.53654.426022.454712@lisa.zopyra.com> <20070215214352.GA2980@coredump.intra.peff.net> <17876.54845.708466.669437@lisa.zopyra.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Bill Lear X-From: git-owner@vger.kernel.org Thu Feb 15 22:58:28 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HHocS-0000Ak-M2 for gcvg-git@gmane.org; Thu, 15 Feb 2007 22:58:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932833AbXBOV6T (ORCPT ); Thu, 15 Feb 2007 16:58:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932835AbXBOV6T (ORCPT ); Thu, 15 Feb 2007 16:58:19 -0500 Received: from 66-23-211-5.clients.speedfactory.net ([66.23.211.5]:2600 "HELO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932833AbXBOV6S (ORCPT ); Thu, 15 Feb 2007 16:58:18 -0500 Received: (qmail 4324 invoked from network); 15 Feb 2007 16:58:24 -0500 Received: from unknown (HELO coredump.intra.peff.net) (10.0.0.2) by 66-23-211-5.clients.speedfactory.net with SMTP; 15 Feb 2007 16:58:24 -0500 Received: by coredump.intra.peff.net (sSMTP sendmail emulation); Thu, 15 Feb 2007 16:58:16 -0500 Content-Disposition: inline In-Reply-To: <17876.54845.708466.669437@lisa.zopyra.com> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Feb 15, 2007 at 03:53:01PM -0600, Bill Lear wrote: > Is this really the way 1.4.4.1 works? I have (mistakenly) been > working on my tracking branch, committing to it, pushing it, pulling > in from elsewhere, shifting to new branches, etc., and I haven't lost > anything, and can't see what harm I've done... Sorry, I thought you were talking about v1.5. v1.4.* does not have the detached HEAD feature, and the default layout is to keep tracking and local branches in the same namespace. This means that you can checkout and commit to a tracking branch just as a local branch, and all changes will be saved. It will only bite you later, when you try to fetch into that tracking branch and realize that the fetch is not a fast-forward (remember the troubles you were having with fetches and pushes last week? Those were caused by working on the tracking branches). Those branches were moved to a separate namespace in v1.5 so that it's harder to accidentally commit to them. > > git checkout -b topic origin/topic > > Sure, it is easy, but it's surprising to (our) users when they > do a clone and can't "jump right in", and have to spend 3 seconds > doing the above... Fair enough. It should be pretty simple to implement; why don't you try working up a patch? :) -Peff