diff for duplicates of <1481915962.29291.96.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index ab8bd57..4ef4f86 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,10 +70,3 @@ index 1579230ebacc..97078f7629e2 100755 # check for missing blank lines after declarations if ($sline =~ /^\+\s+\S/ && #Not at char 1 # actual declarations --------------- next part -------------- -A non-text attachment was scrubbed... -Name: cp_trailing_context_blank.diff -Type: text/x-patch -Size: 860 bytes -Desc: not available -URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20161216/63a30696/attachment.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..e8f372c --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,3 @@ +Content-Disposition: attachment; filename="cp_trailing_context_blank.diff" +Content-Type: text/x-patch; name="cp_trailing_context_blank.diff"; charset="ISO-8859-1" +Content-Transfer-Encoding: base64 diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..6cf4778 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,27 @@ + scripts/checkpatch.pl | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl +index 1579230ebacc..97078f7629e2 100755 +--- a/scripts/checkpatch.pl ++++ b/scripts/checkpatch.pl +@@ -3063,6 +3063,19 @@ sub process { + $last_blank_line = $linenr; + } + ++# Another check for multiple consecutive blank lines where the following ++# line is part of the context and is also blank ++ if ($line =~ /^\+\s*$/ && ++ defined $rawlines[$linenr] && ++ $rawlines[$linenr] =~ /^ \s*$/) { ++ if (CHK("LINE_SPACING", ++ "Please don't use multiple blank lines\n" . $hereprev) && ++ $fix) { ++ fix_delete_line($fixlinenr, $rawline); ++ } ++ $last_blank_line = $linenr; ++ } ++ + # check for missing blank lines after declarations + if ($sline =~ /^\+\s+\S/ && #Not at char 1 + # actual declarations diff --git a/a/content_digest b/N1/content_digest index 64ef87d..73696ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01481913804.29291.92.camel@perches.com\0" "ref\020161216185355.GH8176@mwanda\0" "From\0Joe Perches <joe@perches.com>\0" - "Subject\0[lustre-devel] [PATCH] staging : lustre : Remove braces from single-line body.\0" + "Subject\0Re: [PATCH] staging : lustre : Remove braces from single-line body.\0" "Date\0Fri, 16 Dec 2016 11:19:22 -0800\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Tabrez khan <khan.tabrez21@gmail.com>" @@ -13,7 +13,7 @@ gregkh@linuxfoundation.org linux-kernel@vger.kernel.org " lustre-devel@lists.lustre.org\0" - "\00:1\0" + "\01:1\0" "b\0" "On Fri, 2016-12-16 at 21:53 +0300, Dan Carpenter wrote:\n" "> On Fri, Dec 16, 2016 at 10:43:24AM -0800, Joe Perches wrote:\n" @@ -86,13 +86,36 @@ "+\n" " # check for missing blank lines after declarations\n" " \t\tif ($sline =~ /^\\+\\s+\\S/ &&\t\t\t#Not at char 1\n" - " \t\t\t# actual declarations\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: cp_trailing_context_blank.diff\n" - "Type: text/x-patch\n" - "Size: 860 bytes\n" - "Desc: not available\n" - URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20161216/63a30696/attachment.bin> + " \t\t\t# actual declarations" + "\01:2\0" + "fn\0cp_trailing_context_blank.diff\0" + "b\0" + " scripts/checkpatch.pl | 13 +++++++++++++\n" + " 1 file changed, 13 insertions(+)\n" + "\n" + "diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl\n" + "index 1579230ebacc..97078f7629e2 100755\n" + "--- a/scripts/checkpatch.pl\n" + "+++ b/scripts/checkpatch.pl\n" + "@@ -3063,6 +3063,19 @@ sub process {\n" + " \t\t\t$last_blank_line = $linenr;\n" + " \t\t}\n" + " \n" + "+# Another check for multiple consecutive blank lines where the following\n" + "+# line is part of the context and is also blank\n" + "+\t\tif ($line =~ /^\\+\\s*$/ &&\n" + "+\t\t defined $rawlines[$linenr] &&\n" + "+\t\t $rawlines[$linenr] =~ /^ \\s*$/) {\n" + "+\t\t\tif (CHK(\"LINE_SPACING\",\n" + "+\t\t\t\t\"Please don't use multiple blank lines\\n\" . $hereprev) &&\n" + "+\t\t\t $fix) {\n" + "+\t\t\t\tfix_delete_line($fixlinenr, $rawline);\n" + "+\t\t\t}\n" + "+\t\t\t$last_blank_line = $linenr;\n" + "+\t\t}\n" + "+\n" + " # check for missing blank lines after declarations\n" + " \t\tif ($sline =~ /^\\+\\s+\\S/ &&\t\t\t#Not at char 1\n" + " \t\t\t# actual declarations" -8623e8a031ccc676c0401d757401daed87afe0b145549e763ca1fc2dba38570e +4408edc91703dd32b99f6188466ea925f419d9e9680d546f481aadeb1d239203
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.