master branch reset

[Geert Uytterhoeven]

On Mon, 4 Dec 2006, Paul Mackerras wrote:
> If you are following the master branch, throw away the old master
> branch and grab the new one.  Once the mirrors have caught up, you can
> do this with:
> 
> $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> $ git reset --hard FETCH_HEAD

I did this yesterday. But when I wanted to update, I got:

| pademelon$ git pull -v
| Unpacking 1595 objects
|  100% (1595/1595) done
| * committish: ef6a3165e75c189da82c943a081cd1da52068738
|   branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/for-2.6.20: same as branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * committish: e62438630ca37539c8cc1553710bbfaa3cf960a7
|   branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/origin: does not fast forward to branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc;
|   not updating.
| pademelon$

2nd try:

| pademelon$ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
| Unpacking 1595 objects
|  100% (1595/1595) done
| pademelon$ git reset --hard FETCH_HEAD
| pademelon$ git pull -v * committish: ef6a3165e75c189da82c943a081cd1da52068738
|   branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/for-2.6.20: same as branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * committish: e62438630ca37539c8cc1553710bbfaa3cf960a7
|   branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/origin: does not fast forward to branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc;
|   not updating.
| pademelon$

Any clues? Delete and reclone?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven at sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium