From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: Re: [PATCH] Merge non-first refs that match first refspec Date: Fri, 28 Sep 2007 01:25:48 -0400 Message-ID: <20070928052548.GX3099@spearce.org> References: <20070928041509.GU3099@spearce.org> <20070928044824.GV3099@spearce.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Junio C Hamano , git@vger.kernel.org To: Daniel Barkalow X-From: git-owner@vger.kernel.org Fri Sep 28 07:26:02 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 1Ib8MT-00076D-GL for gcvg-git-2@gmane.org; Fri, 28 Sep 2007 07:26:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755534AbXI1FZy (ORCPT ); Fri, 28 Sep 2007 01:25:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755491AbXI1FZx (ORCPT ); Fri, 28 Sep 2007 01:25:53 -0400 Received: from corvette.plexpod.net ([64.38.20.226]:47586 "EHLO corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446AbXI1FZx (ORCPT ); Fri, 28 Sep 2007 01:25:53 -0400 Received: from [74.70.48.173] (helo=asimov.home.spearce.org) by corvette.plexpod.net with esmtpa (Exim 4.68) (envelope-from ) id 1Ib8Mx-0007d3-Rb; Fri, 28 Sep 2007 01:26:31 -0400 Received: by asimov.home.spearce.org (Postfix, from userid 1000) id CC8D820FBAE; Fri, 28 Sep 2007 01:25:48 -0400 (EDT) Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.11 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - corvette.plexpod.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - spearce.org Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Daniel Barkalow wrote: > On Fri, 28 Sep 2007, Shawn O. Pearce wrote: > > > Daniel Barkalow wrote: > > > Beats me; Junio, what's your test case? > > > > If I understood him correctly it is this: > > > > mkdir foo; cd foo; git init > > git config remote.origin.url git://repo.or.cz/alt-git.git > > git config remote.origin.fetch refs/heads/master:refs/remotes/origin/master > > git config --add remote.origin.fetch refs/heads/maint:refs/remotes/origin/maint > > git pull > > > > We should see "master" listed in .git/FETCH_HEAD as a "for-merge" > > and "maint" listed as a "not-for-merge"... > > > > But if that remote.origin.fetch was a wildcard spec this shouldn't > > happen as the results are unpredictable. But above the user > > explicitly put master first, so it should be defaulted to. > > But after that sequence, the right thing does happen. So I'm guessing that > he has some different sequence that triggers a bug. OK. Then I don't understand what issue Junio identified. And it makes me feel better knowing that the current code does do the right thing in the above case, because that's what I meant for it to do when I was last in there... -- Shawn.