archive mirror
 help / color / mirror / Atom feed
From: Andrew Morton <>
To: Joe Perches <>
Subject: diffs in changelogs
Date: Thu, 11 Jun 2015 13:40:06 -0700	[thread overview]
Message-ID: <> (raw)

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

eg, something like

	git show d24a6e1087030b6da | patch -p1

will go haywire.

So can we please have a checkpatch test warning people away from doing

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]@@ -".


             reply	other threads:[~2015-06-11 20:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-11 20:40 Andrew Morton [this message]
2015-06-12  3:12 ` diffs in changelogs Joe Perches
2015-06-12  3:21   ` Andrew Morton
2015-06-12  3:54     ` Joe Perches
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:

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

  git send-email \ \ \ \ \

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