[Gta04-owner] Linux 3.5 on GTA04

[Dr. H. Nikolaus Schaller]

Am 24.07.2012 um 08:50 schrieb NeilBrown:

> On Tue, 24 Jul 2012 08:28:43 +0200 "Dr. H. Nikolaus Schaller"
> <hns at goldelico.com> wrote:
> 
>> Hi,
>> great work!
>> 
>> Just for help for an infrequent user of git: what is the correct git command to update the local tree?
>> 
>> I have tried (gta04 is a git remote for git://github.com/neilbrown/linux.git):
>> 
>> git fetch gta04 && git reset --hard gta04/3.5.y
>> 
>> but get
>> 
>> fatal: ambiguous argument 'gta04/3.5.y': unknown revision or path not in the working tree.
>> Use '--' to separate paths from revisions
>> 
>> Using -- before or after gta04/3.5.y gives different error messages.
> 
> The name 'gta04/3.5.y' is known only in the context of the 'gta04' remote.
> So
>   git branch -a
> will list it like that.
> You could
>   git checkout gta04/gta04/3.5.y
> 
> or you could make it a 'local' branch that follows the remote branch with
>   git --track gta04/gta04/3.5.y

this gave me:

$ git branch --track gta04/gta04/3.5.y
fatal: Cannot setup tracking information; starting point is not a branch.

> 
> which will give you a local branch called 'gta04/3.5.y'
> if you want a different name, add "-b my-different-name".

This seems to work:

$ git checkout gta04/gta04/3.5.y
Checking out files: 100% (9582/9582), done.
Previous HEAD position was efafd2a... omap2430: don't loop indefinitely in interrupt.
HEAD is now at 99ab4a9... Merge branches 'bq27000', 'pwm', 'omap', 'power', 'displays', 'codecs', 'hso', 'mmc', 'hdq', 'serial', 'hdq-paul', 'defer', 'suspend', 'dtr', 'bugs' and 'gta04' into mainline
$ 

How can I be sure that it is the latest version and not a mixture with the previous files, because it says something about 'merge'?

But it did compile with just some warnings (Section mismatch, type mismatch, uninitialized variables). Next step will be to try if it works :)

BR,
Nikolaus