Re: RFC: git pull <remote> making an octopus?
From: Michael S. Tsirkin <hidden>
Date: 2016-06-15 22:42:36
Quoting r. Junio C Hamano [off-list ref]:
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. My .git/remotes/origin has: URL: /mswg/git/infiniband/.git Pull: refs/heads/ofed_1_1:refs/heads/ofed_1_1 Pull: refs/heads/cma_branch:refs/heads/cma_branch Pull: refs/heads/linus_master:refs/heads/linus_master Pull: refs/heads/master:refs/heads/master Pull: refs/heads/mst_sdp:refs/heads/mst_sdp Pull: refs/heads/ofed_addons:refs/heads/origin Moving the last line Pull: refs/heads/ofed_addons:refs/heads/origin to be the first, like this Pull: refs/heads/ofed_addons:refs/heads/origin Pull: refs/heads/ofed_1_1:refs/heads/ofed_1_1 Pull: refs/heads/cma_branch:refs/heads/cma_branch Pull: refs/heads/linus_master:refs/heads/linus_master Pull: refs/heads/master:refs/heads/master Pull: refs/heads/mst_sdp:refs/heads/mst_sdp fixes the issue. So it seems git pull behaves differently depending on whether the origin pull line is first or not? -- MST