retrieving a diff from git

retrieving a diff from git

[Folkert van Heusden]

Hi,

How would I retrieve the 'kmemcheck' patches from git for the 2.6.27
kernel? I browsed to the url
http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git&a=search&h=HEAD&st=commit&s=kmemcheck
but could not find how to retrieve that diff.


Folkert van Heusden

-- 
Ever wonder what is out there? Any alien races? Then please support
the seti@home project: setiathome.ssl.berkeley.edu
----------------------------------------------------------------------
Phone: +31-6-41278122, PGP-key: 1F28D8AE, www.vanheusden.com

Re: retrieving a diff from git

[Alex Riesen]

2008/10/14 Folkert van Heusden <folkert@vanheusden.com>:
> How would I retrieve the 'kmemcheck' patches from git for the 2.6.27
> kernel? I browsed to the url
> http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...
> but could not find how to retrieve that diff.

Well, you can of course just click on "commitdiff" (and "raw" afterwords)
for every commit, but ... Have you considered using Git for that?

Re: retrieving a diff from git

[Folkert van Heusden]

> > How would I retrieve the 'kmemcheck' patches from git for the 2.6.27
> > kernel? I browsed to the url
> > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...
> > but could not find how to retrieve that diff.
> Well, you can of course just click on "commitdiff" (and "raw" afterwords)
> for every commit,

Hmmm the outcome does not apply cleanly to 2.6.27.

> but ... Have you considered using Git for that?

and check out the whole tree using Git? I did consider but then I would
not have all bells and whistles to generate a Debian kernel package.


Folkert van Heusden

-- 
MultiTail is a versatile tool for watching logfiles and output of
commands. Filtering, coloring, merging, diff-view, etc.
http://www.vanheusden.com/multitail/
----------------------------------------------------------------------
Phone: +31-6-41278122, PGP-key: 1F28D8AE, www.vanheusden.com

Re: retrieving a diff from git

[Alex Riesen]

2008/10/14 Folkert van Heusden <folkert@vanheusden.com>:
>> > How would I retrieve the 'kmemcheck' patches from git for the 2.6.27
>> > kernel? I browsed to the url
>> > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...
>> > but could not find how to retrieve that diff.
>> Well, you can of course just click on "commitdiff" (and "raw" afterwords)
>> for every commit,
>
> Hmmm the outcome does not apply cleanly to 2.6.27.

That's because the patches are not based on 2.6.27.

>> but ... Have you considered using Git for that?
>
> and check out the whole tree using Git? I did consider but then I would
> not have all bells and whistles to generate a Debian kernel package.

I afraid, that in this particular case you have no other choice, but ask Ingo.

Re: retrieving a diff from git

[Matthieu Moy]

Folkert van Heusden <folkert@vanheusden.com> writes:

>> but ... Have you considered using Git for that?
>
> and check out the whole tree using Git? I did consider but then I would
> not have all bells and whistles to generate a Debian kernel package.

You can probably clone the Kernel repository, generate a huge diff
with git diff, and apply it to your Debian tree with patch or
git apply, but if the patch serie is not based on your tree, this
won't help with conflicts.

-- 
Matthieu

Re: retrieving a diff from git

[Christian Jaeger]

Folkert van Heusden wrote:
>> Well, you can of course just click on "commitdiff" (and "raw" afterwords)
>> for every commit,
>>     
>
> Hmmm the outcome does not apply cleanly to 2.6.27.
>
>   
>> but ... Have you considered using Git for that?
>>     
>
> and check out the whole tree using Git? I did consider but then I would
> not have all bells and whistles to generate a Debian kernel package.
>   

I'm tempted to think that you should move (merge / cherry-pick or 
rebase) the relevant changes onto 2.6.27 using Git, and then take the 
diff from there (on the theory that Git could reduce the number of 
conflicts that you would have to resolve manually, although I'm not sure 
how much this is the case); the resulting diff will then apply cleanly 
to a 2.6.27 tarball without using Git.

Christian.