git pull can not find message file

[Elmar Stellnberger]

Trying to update my sucessfully downloaded Linux sources with a 'git pull' in the respective directory I get some strange errors, sed crashing with a segmentation error while not finding some message files:

[e:\sources\linux-kernel]git pull
Message file not found.
Message file not found.
[1] Segmentation fault (core dumped) sed -e "/ not-fo... |

Done tr "
012" " "

Your configuration specifies to merge with the ref 'master'
from the remote, but no such ref was fetched.

[Yuri Dario]

I think you miss some tools in the path, please check

\usr\libexec\git-core\git-pull

script and see which tools are required to run it.

[Elmar Stellnberger]

Well; git-pull is here:

[e:\usr\libexec\git-core]dir git-pull
18.12.11 19.39 7.739 124 git-pull

a shell script:
[e:\usr\libexec\git-core]head git-pull
#!/@unixroot/usr/bin/sh

[Elmar Stellnberger]

Now I have updated sed and that looks better:

[c:\os2\apps]sed -e "/ not-for-merge /d" -e "s/ .*" E:/sources/l
inux-kernel/.git/FETCH_HEAD
E:/sources/linux-kernel/.git/FETCH_HEAD
-e "/ not-for-merge /d" -e "s/ .*"
bbec0270bdd887f96377065ee38b8848b5afa395 not-for-merge branch 'block-de
v' of ​git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
7e5530af11be68f3109672aed59243f82e1272f0 branch 'master' of git:/
/git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[e:\sources\linux-kernel]git pull

• not something we can mergeaed59243f82e1272f0

[Dave Yeo]

Work around for the "not something we can merge" error, after pulling do

git reset --hard origin/master

Note that any local uncommitted changes will be lost
While on the subject, if git pull fails you can do

git fetch --force

and then the reset command

[Silvan Scherrer]

as this ticket doesn't belong to rpm/yum section I closed it. Feel free to open a git ticket in the ports section.