qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 06/12] checkpatch: consider git extended headers valid patches
Date: Tue, 19 Jul 2016 10:34:13 +0200	[thread overview]
Message-ID: <1468917259-8475-7-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1468917259-8475-1-git-send-email-pbonzini@redhat.com>

From: Stefan Hajnoczi <stefanha@redhat.com>

Renames look like this with git-diff(1) when diff.renames = true is set:

  diff --git a/a b/b
  similarity index 100%
  rename from a
  rename to b

This raises the "Does not appear to be a unified-diff format patch"
error because checkpatch.pl only considers a diff valid if it contains
at least one "@@" hunk.

This patch accepts renames and copies too so that checkpatch.pl exits
successfully when a diff only renames/copies files.  The git diff
extended header format is described on the git-diff(1) man page.

Reported-by: Colin Lord <clord@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <1468576014-28788-1-git-send-email-stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/checkpatch.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index cf32c8f..afa7f79 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1279,6 +1279,11 @@ sub process {
 			}
 		}
 
+# Accept git diff extended headers as valid patches
+		if ($line =~ /^(?:rename|copy) (?:from|to) [\w\/\.\-]+\s*$/) {
+			$is_patch = 1;
+		}
+
 #check the patch for a signoff:
 		if ($line =~ /^\s*signed-off-by:/i) {
 			# This is a signoff, if ugly, so do not double report.
-- 
2.7.4

  parent reply	other threads:[~2016-07-19  8:34 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-19  8:34 [Qemu-devel] [PULL v2 00/12] Misc patches for 2.7 hard freeze from 2016-07-18 Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 01/12] use g_path_get_dirname instead of dirname Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 02/12] Changed malloc to g_malloc, free to g_free in bsd-user/qemu.h Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 03/12] hw/i386: add device tree support Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 04/12] compiler: never omit assertions if using a static analysis tool Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 05/12] megasas: remove useless check for cmd->frame Paolo Bonzini
2016-07-19  8:34 ` Paolo Bonzini [this message]
2016-07-19  8:34 ` [Qemu-devel] [PULL 07/12] exec: avoid realloc in phys_map_node_reserve Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 08/12] cpu-exec: Move down some declarations in cpu_exec() Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 09/12] Move README to markdown Paolo Bonzini
2016-07-19 15:49   ` Daniel P. Berrange
2016-07-19 18:15     ` Pranith Kumar
2016-07-19 20:54       ` Peter Maydell
2016-07-19  8:34 ` [Qemu-devel] [PULL 10/12] block/iscsi: fix rounding in iscsi_allocationmap_set Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 11/12] block/iscsi: allow caching of the allocation map Paolo Bonzini
2016-07-19  8:34 ` [Qemu-devel] [PULL 12/12] target-i386: Remove redundant HF_SOFTMMU_MASK Paolo Bonzini
2016-07-19 15:39 ` [Qemu-devel] [PULL v2 00/12] Misc patches for 2.7 hard freeze from 2016-07-18 Peter Maydell

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=1468917259-8475-7-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).