From: Junio C Hamano <junkio@cox.net>
Date: Sat, 08 Apr 2006 20:55:28 GMT
Subject: Re: strange behavior when pulling updates / get uptodate with git.git
Message-ID: <7vmzeveqin.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <4438158C.1080208@iaglans.de>

Nicolas Vilz 'niv' <niv@iaglans.de> writes:

> URL: git://git.kernel.org/pub/scm/git/git.git
> Pull: refs/heads/master:refs/heads/origin
> Pull: refs/heads/todo:refs/heads/todo
> Pull: refs/heads/maint:refs/heads/maint
> Pull: refs/heads/pu:refs/heads/pu
> Pull: refs/heads/man:refs/heads/man
> Pull: refs/heads/next:refs/heads/next
> Pull: refs/heads/html:refs/heads/html
>
> so i suppose, if i try to pull origin, and i am in master, i should be
> able to pull these remote heads each in the correct local head...
>
> But I obviously don't.

Most likely it is aborted by the "pu" branch not
fast-forwarding.

	Pull: +refs/heads/pu:refs/heads/pu

or dropping "pu" altogether if you are not interested in it,
would help.  My repositories (the ones I fetch/pull from for
testing) have only these:

        URL: git://git.kernel.org/pub/scm/git/git.git
        Pull: refs/heads/master:refs/heads/origin
        Pull: refs/heads/next:refs/heads/next
        Pull: +refs/heads/pu:refs/heads/pu
        Pull: refs/heads/maint:refs/heads/maint