shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

script: fix the defects in the merge_pre_check.pl [1/1]

Browse Source 
PD#174488

Problem:
some defects in the script.

Solution:
rechange check rules in the script.

Verify:
verified locally.

Change-Id: I9c7011d1bd3b1d52131318dae34112d0d0164a00
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
This commit is contained in:
Jianxiong Pan
2018-10-23 12:24:57 +08:00
parent 09f912276e
commit cdc14a2bb8
1 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
scripts/amlogic/merge_pre_check.pl
View File

@@ -131,88 +131,42 @@ sub check_msg_49
sub check_msg_49_2
{
my $msg = `git cat-file commit HEAD~0 | sed '1,/\^\$/d'`;
my @str = split /[\n][\n]/, $msg;
if( $msg !~ /^([\w]+:\s){1,2}.+(\s)\[[\d]\/[\d]\][\n][\n]/ )
if( $str[0] !~ /^([\w]+:\s){1,2}.+(\s)\[[\d]\/[\d]\]$/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: <module: message>\n";
$msg =~ s/.+(\S)[\n]+//;
}
elsif( $msg =~ /(kernel)/i )
elsif( $str[0] =~ /(kernel)/i )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: Should be no 'kernel' in kernel commit message\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^([\w]+:\s){1,2}.+(\S)[\n][\n]//;
}
if( $msg !~ /^PD\#.+(\S)[\n][\n]/ )
if( $str[1] !~ /^PD\#.+(\S)$/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: <PD#XXXX>\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^PD\#.+(\S)[\n][\n]//;
}
if( $msg !~ /^Problem:[\n](.+(\S)[\n])+[\n]/ )
if( $str[2] !~ /^Problem:[\n].+/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: Problem:\n detailed description\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^Problem:[\n](.+(\S)[\n])+[\n]//;
}
if( $msg !~ /^Solution:[\n](.+(\S)[\n])+[\n]/ )
if( $str[3] !~ /^Solution:[\n].+/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: Solution:\n detailed description\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^Solution:[\n](.+(\S)[\n])+[\n]//;
}
if( $msg !~ /^Verify:[\n](.+(\S)[\n])+[\n]/ )
if( $str[4] !~ /^Verify:[\n].+/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: Verify:\n detailed description\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^Verify:[\n](.+(\S)[\n])+[\n]//;
}
if( $msg !~ /^Change-Id:\s[\w]+(\S)[\n]/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: <Change-Id: xxxxx>\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^Change-Id:\s[\w]+(\S)[\n]//;
}
if( $msg !~ /^Signed-off-by:\s.+(\S)$/ )
{
$err_cnt += 1;
$err_msg .= " $err_cnt: <Signed-off-by: xxxxx>\n";
$msg =~ s/.+(\S)[\n]+//;
}
else
{
$msg =~ s/^Signed-off-by:\s.+(\S)$//;
}
}