{"thread":{"id":"15895","subject":"retrieving a diff from git","startedAt":"2008-10-14T14:51:12Z","lastAt":"2008-10-15T10:12:40Z","messageCount":6,"participants":["Folkert van Heusden","Alex Riesen","Matthieu Moy","Christian Jaeger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"93009","messageId":"20081014145112.GR22427@vanheusden.com","threadId":"15895","inReplyTo":null,"subject":"retrieving a diff from git","fromName":"Folkert van Heusden","fromEmail":"folkert@vanheusden.com","sentAt":"2008-10-14T14:51:12Z","receivedAt":"2008-10-14T14:51:12Z","isPatch":false,"sender":{"key":"folkert@vanheusden.com","avatar":null},"body":"Hi,\n\nHow would I retrieve the 'kmemcheck' patches from git for the 2.6.27\nkernel? I browsed to the url\nhttp://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git&a=search&h=HEAD&st=commit&s=kmemcheck\nbut could not find how to retrieve that diff.\n\n\nFolkert van Heusden\n\n-- \nEver wonder what is out there? Any alien races? Then please support\nthe seti@home project: setiathome.ssl.berkeley.edu\n----------------------------------------------------------------------\nPhone: +31-6-41278122, PGP-key: 1F28D8AE, www.vanheusden.com\n"},{"id":"93019","messageId":"81b0412b0810141001w46227afam70123237025a2d4d@mail.gmail.com","threadId":"15895","inReplyTo":"20081014145112.GR22427@vanheusden.com","subject":"Re: retrieving a diff from git","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2008-10-14T17:01:03Z","receivedAt":"2008-10-14T17:01:03Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"2008/10/14 Folkert van Heusden <folkert@vanheusden.com>:\n> How would I retrieve the 'kmemcheck' patches from git for the 2.6.27\n> kernel? I browsed to the url\n> http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...\n> but could not find how to retrieve that diff.\n\nWell, you can of course just click on \"commitdiff\" (and \"raw\" afterwords)\nfor every commit, but ... Have you considered using Git for that?\n"},{"id":"93021","messageId":"20081014172048.GW22427@vanheusden.com","threadId":"15895","inReplyTo":"81b0412b0810141001w46227afam70123237025a2d4d@mail.gmail.com","subject":"Re: retrieving a diff from git","fromName":"Folkert van Heusden","fromEmail":"folkert@vanheusden.com","sentAt":"2008-10-14T17:20:49Z","receivedAt":"2008-10-14T17:20:49Z","isPatch":false,"sender":{"key":"folkert@vanheusden.com","avatar":null},"body":"> > How would I retrieve the 'kmemcheck' patches from git for the 2.6.27\n> > kernel? I browsed to the url\n> > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...\n> > but could not find how to retrieve that diff.\n> Well, you can of course just click on \"commitdiff\" (and \"raw\" afterwords)\n> for every commit,\n\nHmmm the outcome does not apply cleanly to 2.6.27.\n\n> but ... Have you considered using Git for that?\n\nand check out the whole tree using Git? I did consider but then I would\nnot have all bells and whistles to generate a Debian kernel package.\n\n\nFolkert van Heusden\n\n-- \nMultiTail is a versatile tool for watching logfiles and output of\ncommands. Filtering, coloring, merging, diff-view, etc.\nhttp://www.vanheusden.com/multitail/\n----------------------------------------------------------------------\nPhone: +31-6-41278122, PGP-key: 1F28D8AE, www.vanheusden.com\n"},{"id":"93023","messageId":"81b0412b0810141029l7f37426axfc0646fa114fd3b5@mail.gmail.com","threadId":"15895","inReplyTo":"20081014172048.GW22427@vanheusden.com","subject":"Re: retrieving a diff from git","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2008-10-14T17:29:03Z","receivedAt":"2008-10-14T17:29:03Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"2008/10/14 Folkert van Heusden <folkert@vanheusden.com>:\n>> > How would I retrieve the 'kmemcheck' patches from git for the 2.6.27\n>> > kernel? I browsed to the url\n>> > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git...\n>> > but could not find how to retrieve that diff.\n>> Well, you can of course just click on \"commitdiff\" (and \"raw\" afterwords)\n>> for every commit,\n>\n> Hmmm the outcome does not apply cleanly to 2.6.27.\n\nThat's because the patches are not based on 2.6.27.\n\n>> but ... Have you considered using Git for that?\n>\n> and check out the whole tree using Git? I did consider but then I would\n> not have all bells and whistles to generate a Debian kernel package.\n\nI afraid, that in this particular case you have no other choice, but ask Ingo.\n"},{"id":"93025","messageId":"vpqfxmz5acr.fsf@bauges.imag.fr","threadId":"15895","inReplyTo":"20081014172048.GW22427@vanheusden.com","subject":"Re: retrieving a diff from git","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2008-10-14T17:56:36Z","receivedAt":"2008-10-14T17:56:36Z","isPatch":false,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Folkert van Heusden <folkert@vanheusden.com> writes:\n\n>> but ... Have you considered using Git for that?\n>\n> and check out the whole tree using Git? I did consider but then I would\n> not have all bells and whistles to generate a Debian kernel package.\n\nYou can probably clone the Kernel repository, generate a huge diff\nwith git diff, and apply it to your Debian tree with patch or\ngit apply, but if the patch serie is not based on your tree, this\nwon't help with conflicts.\n\n-- \nMatthieu\n"},{"id":"93082","messageId":"48F5C218.3080807@jaeger.mine.nu","threadId":"15895","inReplyTo":"20081014172048.GW22427@vanheusden.com","subject":"Re: retrieving a diff from git","fromName":"Christian Jaeger","fromEmail":"christian@jaeger.mine.nu","sentAt":"2008-10-15T10:12:40Z","receivedAt":"2008-10-15T10:12:40Z","isPatch":false,"sender":{"key":"christian@jaeger.mine.nu","avatar":null},"body":"Folkert van Heusden wrote:\n>> Well, you can of course just click on \"commitdiff\" (and \"raw\" afterwords)\n>> for every commit,\n>>     \n>\n> Hmmm the outcome does not apply cleanly to 2.6.27.\n>\n>   \n>> but ... Have you considered using Git for that?\n>>     \n>\n> and check out the whole tree using Git? I did consider but then I would\n> not have all bells and whistles to generate a Debian kernel package.\n>   \n\nI'm tempted to think that you should move (merge / cherry-pick or \nrebase) the relevant changes onto 2.6.27 using Git, and then take the \ndiff from there (on the theory that Git could reduce the number of \nconflicts that you would have to resolve manually, although I'm not sure \nhow much this is the case); the resulting diff will then apply cleanly \nto a 2.6.27 tarball without using Git.\n\nChristian.\n"}]}