Subject: git remote update -> rejected

From: Mike Galbraith <[email-masked]>
Date: Tue, 22 Apr 2008 11:48:53 +0200

Greetings,

Does anyone know what could lead to this?  git doesn't have any trouble
(well, hasn't had any yet) with any trees other than x86 and
sched-devel. Nobody but little old me seems to be having this trouble...

git is pulled nearly every day, but checking out older versions doesn't
make any difference (unless i go too far back of course).

marge:..git/linux-2.6 # git remote update
Updating origin
Updating linux-next
Updating stable
Updating x86
>>From git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
 ! [rejected]        latest     -> x86/latest  (non fast forward)
 ! [rejected]        master     -> x86/master  (non fast forward)
 ! [rejected]        testing    -> x86/testing  (non fast forward)
Updating sched-devel
>>From git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
 ! [rejected]        for-akpm   -> sched-devel/for-akpm  (non fast forward)
 ! [rejected]        latest     -> sched-devel/latest  (non fast forward)
 ! [rejected]        master     -> sched-devel/master  (non fast forward)

If I rm/add the remote back, all goes fine... until it says rejected.

marge:..git/linux-2.6 # git remote rm x86
marge:..git/linux-2.6 # git remote add x86 git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
marge:..git/linux-2.6 # git remote update
Updating origin
Updating linux-next
Updating stable
Updating sched-devel
Updating x86
>>From git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
 * [new branch]      base       -> x86/base
 * [new branch]      for-akpm   -> x86/for-akpm
 * [new branch]      for-linus  -> x86/for-linus
 * [new branch]      latest     -> x86/latest
 * [new branch]      master     -> x86/master
 * [new branch]      origin     -> x86/origin
 * [new branch]      testing    -> x86/testing
marge:..git/linux-2.6 #