From 064a48ffe373b5d1817b9f748990381e67ed7684 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 10 Jan 2012 15:09:50 -0800
Subject: [PATCH] --- yaml --- r: 283067 b: refs/heads/master c:
 270c49a088ae58d4b817861bb04bfec63b0966db h: refs/heads/master i:   283065:
 d708a038215ef97f5e53c07790c3889ca277c896   283063:
 47a1ab49f5443e66177b7db42395dae10f008bc5 v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 664f6e85704b..6cec196e2b45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96b62067f970ff529c98913311d33f4b57b453dc
+refs/heads/master: 270c49a088ae58d4b817861bb04bfec63b0966db
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 8fda3b3f7be8..885e3b43d64a 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1504,9 +1504,11 @@ sub process {
 		if ($line =~ /^diff --git.*?(\S+)$/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
+			$in_commit_log = 0;
 		} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
+			$in_commit_log = 0;
 
 			$p1_prefix = $1;
 			if (!$file && $tree && $p1_prefix ne '' &&
@@ -1546,7 +1548,8 @@ sub process {
 		}
 
 # Check signature styles
-		if ($line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
+		if (!$in_header_lines &&
+		    $line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
 			my $space_before = $1;
 			my $sign_off = $2;
 			my $space_after = $3;
@@ -1623,7 +1626,7 @@ sub process {
 # Check if it's the start of a commit log
 # (not a header line and we haven't seen the patch filename)
 		if ($in_header_lines && $realfile =~ /^$/ &&
-		    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+		    $rawline !~ /^(commit\b|from\b|[\w-]+:).+$/i) {
 			$in_header_lines = 0;
 			$in_commit_log = 1;
 		}