From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbbFLDSy (ORCPT ); Thu, 11 Jun 2015 23:18:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:35213 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750931AbbFLDSw (ORCPT ); Thu, 11 Jun 2015 23:18:52 -0400 Date: Thu, 11 Jun 2015 20:21:35 -0700 From: Andrew Morton To: Joe Perches Cc: linux-kernel@vger.kernel.org, Kent Overstreet Subject: Re: diffs in changelogs Message-Id: <20150611202135.ee070955.akpm@linux-foundation.org> In-Reply-To: <1434078779.2972.23.camel@perches.com> References: <20150611134006.9df79a893e3636019ad2759e@linux-foundation.org> <1434078779.2972.23.camel@perches.com> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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.