From 5c7cb7bd713df635c921759e32673e2fa4a14592 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Thu, 29 Sep 2016 17:33:32 -0500 Subject: chore: improve pre-commit/pre-push git hook error messages --- scripts/git-hooks/pre-commit | 9 +++++++-- scripts/git-hooks/pre-push | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/git-hooks/pre-commit b/scripts/git-hooks/pre-commit index f930ca7..ee010cb 100755 --- a/scripts/git-hooks/pre-commit +++ b/scripts/git-hooks/pre-commit @@ -6,10 +6,15 @@ if [ "$currentBranch" == "master" ]; then gitlabOccurances=$(grep -c -m1 gitlab .gitmodules) if [ $gitlabOccurances -eq 1 ]; then - echo "COMMIT INVALID: You can't commit anything to the master branch that pulls + echo " +************************************************************************* +COMMIT INVALID: .gitmodules has a reference to GitLab + +You can't commit anything to the master branch that pulls from GitLab because outsiders won't be able to build it. -If you need to use a submodule from GitLab, do so from a branch." +If you need to use a submodule from GitLab, do so from a branch. +*************************************************************************" exit 1 fi fi diff --git a/scripts/git-hooks/pre-push b/scripts/git-hooks/pre-push index 85b5095..9cacb8f 100755 --- a/scripts/git-hooks/pre-push +++ b/scripts/git-hooks/pre-push @@ -6,10 +6,15 @@ if [ "$currentBranch" == "master" ]; then gitlabOccurances=$(grep -c -m1 gitlab .gitmodules) if [ $gitlabOccurances -eq 1 ]; then - echo "PUSH ERROR: You can't push anything to the master branch that pulls + echo " +************************************************************************* +PUSH ERROR: .gitmodules has a reference to GitLab + +You can't push anything to the master branch that pulls from GitLab because outsiders won't be able to build it. -If you need to use a submodule from GitLab, do so from a branch." +If you need to use a submodule from GitLab, do so from a branch. +*************************************************************************" exit 1 fi fi -- cgit v1.2.3