Re: diffs in changelogs

2015-06-11 Thread Joe Perches
On Thu, 2015-06-11 at 20:21 -0700, Andrew Morton wrote: > On Thu, 11 Jun 2015 20:12:59 -0700 Joe Perches wrote: > > > On Thu, 2015-06-11 at 13:40 -0700, Andrew Morton wrote: > > > People often put diff snippets in changelogs. This causes problems > > > when one tries to apply a file containing b

Re: diffs in changelogs

2015-06-11 Thread Andrew Morton
On Thu, 11 Jun 2015 20:12:59 -0700 Joe Perches wrote: > On Thu, 2015-06-11 at 13:40 -0700, Andrew Morton wrote: > > People often put diff snippets in changelogs. This causes problems > > when one tries to apply a file containing both the changelog and the > > diff because patch(1) tries to apply

Re: diffs in changelogs

2015-06-11 Thread Joe Perches
On Thu, 2015-06-11 at 13:40 -0700, Andrew Morton wrote: > People often put diff snippets in changelogs. This causes problems > when one tries to apply a file containing both the changelog and the > diff because patch(1) tries to apply the diff which it found in the > changelog. That > eg, somethi

diffs in changelogs

2015-06-11 Thread Andrew Morton
People often put diff snippets in changelogs. This causes problems when one tries to apply a file containing both the changelog and the diff because patch(1) tries to apply the diff which it found in the changelog. eg, something like git show d24a6e1087030b6da | patch -p1 will go haywi