linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
	Kent Overstreet <kent.overstreet@gmail.com>
Subject: Re: diffs in changelogs
Date: Thu, 11 Jun 2015 20:54:34 -0700	[thread overview]
Message-ID: <1434081274.2972.26.camel@perches.com> (raw)
In-Reply-To: <20150611202135.ee070955.akpm@linux-foundation.org>

On Thu, 2015-06-11 at 20:21 -0700, Andrew Morton wrote:
> On Thu, 11 Jun 2015 20:12:59 -0700 Joe Perches <joe@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)?

Dunno.  git am failed.
My guess is it was applied normally and then
git commit --amend added the other diff content

> > 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.

RFCPATCH





  reply	other threads:[~2015-06-12  3:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-11 20:40 diffs in changelogs Andrew Morton
2015-06-12  3:12 ` Joe Perches
2015-06-12  3:21   ` Andrew Morton
2015-06-12  3:54     ` Joe Perches [this message]
2015-06-12 17:51     ` [PATCH] checkpatch: Emit an error when there's a diff in a changelog Joe Perches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434081274.2972.26.camel@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=kent.overstreet@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).