Re: [PATCH] Merge non-first refs that match first refspec

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sep 28, 2007, 05:12 UTC
Message-ID: <Pine.LNX.4.64.0709280108060.5926@iabervon.org>
In-Reply-To: <20070928044824.GV3099@spearce.org>

On Fri, 28 Sep 2007, Shawn O. Pearce wrote:

Show 17 quoted lines

> Daniel Barkalow <barkalow@iabervon.org> 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.

	-Daniel
*This .sig left intentionally blank*