3 messages, 3 authors, 2016-06-15 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:37
"Michael S. Tsirkin" [off-list ref] writes:
Quoting r. Junio C Hamano [off-list ref]:quoted
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?
From: Alex Riesen <hidden>
Date: 2016-06-15 22:42:37
On 8/17/06, Junio C Hamano [off-list ref] wrote:
quoted
quoted
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.
From: Michael S. Tsirkin <hidden>
Date: 2016-06-15 22:42:37
Quoting r. Junio C Hamano [off-list ref]:
quoted
No, I just reproduced this on plain 1.4.2.Doesn't reproduce for me and I am getting worried.
No, that was my mistake, sorry about not clarifying that. Basically what confused me was the following text in get-fetch manpage: While git-pull run without any explicit <refspec> parameter takes default <refspec>s from Pull: lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. And this actually applied to remotes in $GITDIR/remotes and not just when git-pull is run without any parameters. -- MST