git not updating my modular xorg ports tree?

[Rene Ladan]

Hi,

I created a modular xorg ports tree:

# cd /usr
# mv ports orig-ports
# git clone http://git.xbsd.org/freebsd/ports.git
# cd ports
# git checkout xorg

This worked, and git pull used to work, but now it stopped working:

# cd /usr/ports
# git pull
> Fetching refs/heads/master from http://git.xbsd.org/freebsd/ports.git using http
> Fetching refs/heads/xorg from http://git.xbsd.org/freebsd/ports.git using http
> * refs/heads/xorg: does not fast forward to branch 'xorg' of http://git.xbsd.org/freebsd/ports;
>   not updating.

I do get 'got large-hex-number' and 'walk large-hex-number' messages,
but git doesn't update.

I tried a second 'git checkout xorg' and 'git prune' in /usr/ports, but
that didn't help either.  The tree is clean, except from a symlink to
distfiles -> ../orig-ports/distfiles

Suggestions?

Regards,
Rene
-- 
GPG fingerprint = E738 5471 D185 7013 0EE0  4FC8 3C1D 6F83 12E1 84F6
(subkeys.pgp.net)

"It won't fit on the line."
		-- me, 2001