Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent commitcheck.sh from running twice #5952

Merged
merged 1 commit into from
Apr 3, 2017

Conversation

dinatale2
Copy link
Contributor

@dinatale2 dinatale2 commented Apr 1, 2017

Description

commitcheck.sh runs twice when running a make checkstyle. A stray semicolon in the shellcheck make target is causing the problem.

How Has This Been Tested?

On a CentOS 7 VM.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.

@mention-bot
Copy link

@dinatale2, thanks for your PR! By analyzing the history of the files in this pull request, we identified @behlendorf, @FransUrbo and @ryao to be potential reviewers.

@dinatale2
Copy link
Contributor Author

Just updated the regexes to improve matching tagged lines.

@@ -16,7 +16,7 @@ function test_url()
# check for a tagged line
function check_tagged_line()
{
regex='^\s*'"$1"':\s+\S+\s+\<\S+\>'
regex='^\s*'"$1"':\s[-A-Za-z0-9 ]+\s<\S+>$'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex doesn't look broad enough. I'd suggest running it over the email addresses from the last couple hundred commits and makes sure it works. For example, it needs to contain ..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, the email portion of the regex might be too broad. It currently doesn't enforce that @ is present, it just allows 1 or more non-whitespace characters to exist between the < >. Do you want me to enforce that what shows up there is some form of email?

I'm also broadening the name portion of the regex.

A stray semicolon was causing commitcheck.sh
to run twice when running make checkstyle.
Updated regexes for matching tagged lines.

Signed-off-by: Giuseppe Di Natale <[email protected]>
@behlendorf behlendorf merged commit 3f2da6c into openzfs:master Apr 3, 2017
@dinatale2 dinatale2 deleted the checkstyle-fix branch April 5, 2017 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants