Re: [PATCH] Merge non-first refs that match first refspec
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:37
Junio C Hamano [off-list ref] writes:
Daniel Barkalow [off-list ref] writes:quoted
Beats me; Junio, what's your test case?I can paste tomorrow (it is a clone of git.git at work). I do not use .git/config but .git/remotes/origin and explicit four separate Pull: lines and going over http.
Here are the files. Note that I use traditional layout and always have 'master' checked out when I initiate 'git pull'. : xyzzy git.git/master; cat .git/config [core] logallrefupdates = true [diff] color = auto [showbranch] default = --topo-order default = master default = next default = pu [alias] co = checkout : xyzzy git.git/master; cat .git/remotes origin URL: http://repo.or.cz/r/alt-git.git/ Pull: master:origin Pull: next:next Pull: +pu:pu Pull: maint:maint Pull: todo:todo : xyzzy git.git/master; git pull Warning: No merge candidate found because value of config option "branch.master.merge" does not match any remote branch fetched. No changes. : xyzzy git.git/master; git version git version 1.5.3.2.1060.gaf79f : xyzzy git.git/master; exit