Re: RFC: git pull <remote> making an octopus?

From: Junio C Hamano <junkio@cox.net>
Date: Aug 14, 2006, 07:00 UTC
Message-ID: <7vac67g5t5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060814064336.GE21963@mellanox.co.il>

"Michael S. Tsirkin" <mst@mellanox.co.il> writes:

> $ git pull origin
>
> where origin is a file in .git/remotes/origin with multiple Pull: lines,
> then I seem to get an octopus merge.

You shouldn't.

I have four Pull: lines like these for .git/remotes/ko

        URL: kernel.org:/pub/scm/git/git.git/
        Pull: master:refs/tags/ko-master
        Pull: next:refs/tags/ko-next
        Pull: +pu:refs/tags/ko-pu
        Pull: maint:refs/tags/ko-maint
        Push: heads/master
        Push: heads/next
        Push: +heads/pu
        Push: heads/maint

and "git pull ko" leaves this in .git/FETCH_HEAD:

        460c...		branch 'master' of .kernel.org:/pub/scm/git/git
        767f...	not-for-merge	branch 'next' of .kernel.org:/pub/scm/git/git
        9bd4...	not-for-merge	branch 'pu' of .kernel.org:/pub/scm/git/git
        9a1a...	not-for-merge	branch 'maint' of .kernel.org:/pub/scm/git/git

The latter three are not merged into the current branch with the above pull command.

Are you by any chance running a version of git that has some unofficial patches that affect the generation of not-for-merge markers?