On Thu, 11 Jun 2015 20:12:59 -0700 Joe Perches <j...@perches.com> 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 the diff which it found in the > > changelog. > That > > eg, something like > > > > git show d24a6e1087030b6da | patch -p1 > > > > will go haywire. > > > > So can we please have a checkpatch test warning people away from doing > > this? > > > > > > patch(1) seems to be really promiscuous in its detection of a patch. I > > haven't had much success searching for "^--- " and similar. What works > > best for me is searching for "^[whitespace]@@ -". > > I don't think that's a good test. > Coccinelle uses @@ > > And how did that commit actually get applied? Good question. Maybe `git apply' is smarter about this than patch(1)? > I tried applying it to a new branch checked out at > ce2b3f595e1c56639085645e0130426e443008c0, it fails. There are tons of them: z:/usr/src/git26> git log | grep "^[ ]*@@ -" | wc -l 120 > Anyway, maybe: Looks good, thanks. -ENOCHANGELOG. Please send it for real when convenient. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
