Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283067
b: refs/heads/master
c: 270c49a
h: refs/heads/master
i:
  283065: d708a03
  283063: 47a1ab4
v: v3
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Jan 11, 2012
1 parent 9b32ac0 commit 064a48f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96b62067f970ff529c98913311d33f4b57b453dc
refs/heads/master: 270c49a088ae58d4b817861bb04bfec63b0966db
7 changes: 5 additions & 2 deletions trunk/scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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 '' &&
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 064a48f

Please sign in to comment.