[PATCH] checkpatch: Yet another commit id improvement

[PATCH] checkpatch: Yet another commit id improvement

[Joe Perches]

Using \b isn't good enough to isolate what appears to be a
commit id in a commit message.

Make sure there is a space or a quote like character after
a continuous run of hexadecimal characters that could be
a commit id.

Signed-off-by: Joe Perches <joe@perches.com>
cc: "Zhuo, Qiuxu" <qiuxu.zhuo@intel.com>
---
 scripts/checkpatch.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a0e5112..8209ae5 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2460,9 +2460,9 @@ sub process {
 
 # Check for git id commit length and improperly formed commit descriptions
 		if ($in_commit_log && !$commit_log_possible_stack_dump &&
-		    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
+		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
 		    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
-		     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
+		     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&
 		      $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
 		      $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
 			my $init_char = "c";
-- 
2.8.0.rc4.16.g56331f8

Re: [PATCH] checkpatch: Yet another commit id improvement

[Andy Whitcroft]

On Mon, Jul 18, 2016 at 12:27:42PM -0700, Joe Perches wrote:
> Using \b isn't good enough to isolate what appears to be a
> commit id in a commit message.
> 
> Make sure there is a space or a quote like character after
> a continuous run of hexadecimal characters that could be
> a commit id.
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> cc: "Zhuo, Qiuxu" <qiuxu.zhuo@intel.com>
> ---
>  scripts/checkpatch.pl | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index a0e5112..8209ae5 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -2460,9 +2460,9 @@ sub process {
>  
>  # Check for git id commit length and improperly formed commit descriptions
>  		if ($in_commit_log && !$commit_log_possible_stack_dump &&
> -		    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
> +		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
>  		    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
> -		     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
> +		     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&

If we expect a quote after would it be unreasonable to allow then at the
beginning too?

>  		      $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
>  		      $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
>  			my $init_char = "c";

-apw

Re: [PATCH] checkpatch: Yet another commit id improvement

[Joe Perches]

On Tue, 2016-07-19 at 10:51 +0100, Andy Whitcroft wrote:
> On Mon, Jul 18, 2016 at 12:27:42PM -0700, Joe Perches wrote:
> > 
> > Using \b isn't good enough to isolate what appears to be a
> > commit id in a commit message.
> > 
> > Make sure there is a space or a quote like character after
> > a continuous run of hexadecimal characters that could be
> > a commit id.
[]
> > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> > @@ -2460,9 +2460,9 @@ sub process {
> >  
> >  # Check for git id commit length and improperly formed commit descriptions
> >  		if ($in_commit_log && !$commit_log_possible_stack_dump &&
> > -		    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
> > +		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
> >  		    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
> > -		     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
> > +		     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&
> If we expect a quote after would it be unreasonable to allow then at the
> beginning too?

Perhaps not.  The idea is the quote starts the commit description
not ends the commit SHA-1 hash.

Re: [PATCH] checkpatch: Yet another commit id improvement

[Andy Whitcroft]

On Tue, Jul 19, 2016 at 03:05:56AM -0700, Joe Perches wrote:
> On Tue, 2016-07-19 at 10:51 +0100, Andy Whitcroft wrote:
> > On Mon, Jul 18, 2016 at 12:27:42PM -0700, Joe Perches wrote:
> > > 
> > > Using \b isn't good enough to isolate what appears to be a
> > > commit id in a commit message.
> > > 
> > > Make sure there is a space or a quote like character after
> > > a continuous run of hexadecimal characters that could be
> > > a commit id.
> []
> > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> []
> > > @@ -2460,9 +2460,9 @@ sub process {
> > >  
> > >  # Check for git id commit length and improperly formed commit descriptions
> > >  		if ($in_commit_log && !$commit_log_possible_stack_dump &&
> > > -		    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
> > > +		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
> > >  		    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
> > > -		     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
> > > +		     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&
> > If we expect a quote after would it be unreasonable to allow then at the
> > beginning too?
> 
> Perhaps not.  The idea is the quote starts the commit description
> not ends the commit SHA-1 hash.

Then carry on as before.  Looks fine.

-apw