Re: GIT: something wrong with sound-2.6/devel?

[Rene Herman <rene.herman@keyaccess.nl>]

On 20-07-08 22:04, Rene Herman wrote:

> On 20-07-08 21:08, Jaroslav Kysela wrote:
> 
>> On Sun, 20 Jul 2008, Rene Herman wrote:
> 
>>> Is there something wrong with your devel branch or is it me?
>>
>> I think that you have to recommit your patches on top of new Takashi's 
>> tree, because Takashi rebased his tree on top of Linus's tree.
> 
> Hmm. If Takashi did not just now change something, then something that I 
> don't understand is happening since right now it's working fine:
> 
> rene@7ixe4:~/src/linux/7ixe4$ git remote show tiwai
> * remote tiwai
>   URL: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
>   Tracked remote branches
>     devel dma-fix for-linus master upstream
> rene@7ixe4:~/src/linux/7ixe4$ git checkout -b alsa v2.6.26
> Switched to a new branch "alsa"
> rene@7ixe4:~/src/linux/7ixe4$ git pull tiwai devel
> Updating bce7f79..e0bf09b
> Fast forward
> 
> [ ... ]
> 
> ... and a clean merge. Takashi, if you did -- it's fixed.. :-/

But you didn't... the "manual" git fetch tiwai/git merge tiwai/devel 
still fails.

It probably has something to do with this:

rene@7ixe4:~/src/linux/7ixe4$ git fetch tiwai
 From git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
  ! [rejected]        devel      -> tiwai/devel  (non fast forward)
  ! [rejected]        dma-fix    -> tiwai/dma-fix  (non fast forward)
  ! [rejected]        master     -> tiwai/master  (non fast forward)

I'll go ask on the GIT list what this might be about...

Rene.