diff --git a/scripts/githooks/pre-commit.sh b/scripts/githooks/pre-commit.sh index 5c50e5f2..20c5c4d1 100644 --- a/scripts/githooks/pre-commit.sh +++ b/scripts/githooks/pre-commit.sh @@ -84,7 +84,7 @@ HEREDOC # Move to the repo root so git files paths make sense repo_root=$(git rev-parse --show-toplevel 2>/dev/null) cd $repo_root -chmod +x scripts/githooks/pre-commit.sh + against=HEAD @@ -96,8 +96,11 @@ shouldFail=false for file in $( git diff-index --cached --name-only $against ); do file_size=$(([ ! -f $file ] && echo 0) || (ls -la "$file" | awk '{ print $5 }')) if [ "$file_size" -gt "$limit" ] && { grep -q ".github/release-drafter.yml" $file ;}; then - printError "File $file is $(( $file_size / 10**6 )) MB, which is larger than our configured limit of $limitInMB MB" -shouldFail=true + if [ $file_size -gt $limit ]; then + printError "File $file is $filesize MB, which is larger than our configured limit of $limitInMB MB" + shouldFail=true + fi +shouldFail=false printError "File $file is $(( $file_size / 10**6 )) MB, which is larger than our configured limit of $limitInMB MB" shouldFail=true shouldFail=true @@ -115,7 +118,7 @@ fi if [[ ! $local_branch =~ $valid_branch_regex ]] then - printError "The branch name format is invalid. Branch names in this project must adhere to the following format: $valid_branch_regex. Valid branch names should adhere to the following format: {feature|feat|openim|hotfix|test|bug|bot|refactor|revert|ci|cicd|style|}/name.\nEnsure that your branch follows the valid format (e.g., feat/name or bug/name) and try again.\n\nFor more information, refer to: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694" + printError "The branch name format is invalid. Branch names in this project must adhere to the following format: $valid_branch_regex. Valid branch names should adhere to the following format: {feature|feat|openim|hotfix|test|bug|bot|refactor|revert|ci|cicd|style|}/name.\nEnsure that your branch follows the valid format (e.g., feat/name or bug/name) and try again.\n\nFor more information, refer to: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694.\nPlease refer to the provided link for detailed guidance on branch naming conventions and valid formats." exit 1 printMessage "If you really need to commit this file, you can override the size limit by setting the GIT_FILE_SIZE_LIMIT environment variable, e.g. GIT_FILE_SIZE_LIMIT=42000000 for 42MB. Or, commit with the --no-verify switch to skip the check entirely." printError "For more information, refer to: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694"