From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: recent change in git.git/master broke my repos Date: Thu, 25 Oct 2007 12:01:59 -0400 Message-ID: <20071025160159.GA21505@coredump.intra.peff.net> References: <86oden6z97.fsf@blue.stonehenge.com> <20071025155142.GB19655@coredump.intra.peff.net> <86fxzz6vfh.fsf@blue.stonehenge.com> <20071025155712.GA21446@coredump.intra.peff.net> <86bqan6v9f.fsf@blue.stonehenge.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: "Randal L. Schwartz" X-From: git-owner@vger.kernel.org Thu Oct 25 18:02:42 2007 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 1Il5A2-0007hq-F4 for gcvg-git-2@gmane.org; Thu, 25 Oct 2007 18:02:18 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750911AbXJYQCE (ORCPT ); Thu, 25 Oct 2007 12:02:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750893AbXJYQCD (ORCPT ); Thu, 25 Oct 2007 12:02:03 -0400 Received: from 66-23-211-5.clients.speedfactory.net ([66.23.211.5]:2071 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbXJYQCB (ORCPT ); Thu, 25 Oct 2007 12:02:01 -0400 Received: (qmail 22022 invoked by uid 111); 25 Oct 2007 16:02:00 -0000 Received: from coredump.intra.peff.net (HELO coredump.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.32) with SMTP; Thu, 25 Oct 2007 12:02:00 -0400 Received: by coredump.intra.peff.net (sSMTP sendmail emulation); Thu, 25 Oct 2007 12:01:59 -0400 Content-Disposition: inline In-Reply-To: <86bqan6v9f.fsf@blue.stonehenge.com> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Oct 25, 2007 at 08:58:52AM -0700, Randal L. Schwartz wrote: > Jeff> So that should take the remote's refs/heads/* and put them in your > Jeff> refs/remotes/origin/*. I don't see how that would have anything to do > Jeff> with your 'refs/heads/upstream' branch. > > Agreed, but that's the place where fetch might look at refs/heads/upstream, > and the behavior is definitely different between yesterday and today. Fair enough. How about my other questions. Can you 'git-show upstream'? Can you 'git-show origin/master'? -Peff