threads / discuss / 15895

retrieving a diff from git

Subject: retrieving a diff from git

## tl;dr

6 messages between Oct 14, 2008 and Oct 15, 2008.

replies: 5people: 4as markdown or json

Folkert van Heusden· Oct 14, 2008, 14:51 UTC · lore
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
Alex Riesen· Oct 14, 2008, 17:01 UTC · re: Folkert van Heusden · lore

Re: retrieving a diff from git

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?

Folkert van Heusden· Oct 14, 2008, 17:20 UTC · re: Alex Riesen · lore

Re: retrieving a diff from git

Show 6 quoted lines
> > 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
Alex Riesen· Oct 14, 2008, 17:29 UTC · re: Folkert van Heusden · lore

Re: retrieving a diff from git

2008/10/14 Folkert van Heusden <folkert@vanheusden.com>:
Show 8 quoted lines
>> > 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.
Matthieu Moy· Oct 14, 2008, 17:56 UTC · re: Folkert van Heusden · lore

Re: retrieving a diff from git

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
Christian Jaeger· Oct 15, 2008, 10:12 UTC · re: Folkert van Heusden · lore

Re: retrieving a diff from git

Folkert van Heusden wrote:
Show 13 quoted lines
>> 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.

← back to recent threads