Re: tip: bzip2/lzma now in tip:x86/setup-lzma

Alain Knaff
2009-01-06T07:31:20Z

H. Peter Anvin wrote:
> Alain Knaff wrote:
>> H. Peter Anvin wrote:
>>> Go ahead and do an incremental patch at this point.
>>>
>>> -hpa
>>
>> Thanks, that'll make things easier. Unfortunately, I can no longer check
>> out the code. No error messages, but the files just aren't there:
>>
>>
>>> git pull
>> Already up-to-date.
>>> git checkout -b x86/setup-lzma tip/x86/setup-lzma
>> git checkout: branch x86/setup-lzma already exists
>
> I think the "git checkout" failed here because you were trying to create
> a local branch (-b) failed. Just "git checkout x86/setup-lzma" followed
> by "git pull" *should* work...

Yes, that did indeed work. Thanks

> git checkout x86/setup-lzma
Switched to branch "x86/setup-lzma"
> git pull
Updating 2e9f3bd..c8531ab
Fast forward
drivers/block/Kconfig | 20 +++++++++++---------
lib/Kconfig | 13 +++++++++++++
lib/Makefile | 7 +++++--
3 files changed, 29 insertions(+), 11 deletions(-)
> ls lib/decompress_inflate.c
lib/decompress_inflate.c

Alain