From: "Michael S. Tsirkin" <mst@mellanox.co.il>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: RFC: git pull <remote> making an octopus?
Date: Mon, 14 Aug 2006 10:53:05 +0300 [thread overview]
Message-ID: <20060814075305.GH21963@mellanox.co.il> (raw)
In-Reply-To: <7vac67g5t5.fsf@assigned-by-dhcp.cox.net>
Quoting r. Junio C Hamano <junkio@cox.net>:
> 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
next prev parent reply other threads:[~2006-08-14 7:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-14 6:43 RFC: git pull <remote> making an octopus? Michael S. Tsirkin
2006-08-14 7:00 ` Junio C Hamano
2006-08-14 7:53 ` Michael S. Tsirkin [this message]
2006-08-14 17:55 ` Michael S. Tsirkin
2006-08-14 21:45 ` Junio C Hamano
2006-08-15 7:40 ` Alex Riesen
2006-08-15 7:45 ` Junio C Hamano
2006-08-17 9:08 ` Junio C Hamano
2006-08-17 9:18 ` Alex Riesen
2006-08-17 9:46 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060814075305.GH21963@mellanox.co.il \
--to=mst@mellanox.co.il \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox