From: Alex Riesen Date: Thu, 17 Aug 2006 09:18:57 GMT Subject: Re: RFC: git pull making an octopus? Message-ID: <81b0412b0608170218o16253515mbc9846847dfbbee6@mail.gmail.com> In-Reply-To: <7v1wrfu3tl.fsf@assigned-by-dhcp.cox.net> On 8/17/06, Junio C Hamano wrote: > >> Are you by any chance running a version of git that has some > >> unofficial patches that affect the generation of not-for-merge > >> markers? > > > > No, I just reproduced this on plain 1.4.2. > > Doesn't reproduce for me and I am getting worried. > Has anybody else seen this? > I haven't. Michael, could you retry with "GIT_TRACE=1 sh -x -v git-pull" ? I suspect invisible (like \r) character in your remotes. Missing last \n could be interesting too.