From 7a7b60fdf1ec7e18996728bceaa34252ea1296ba Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Fri, 19 Aug 2016 17:45:19 -0700 Subject: [PATCH] mail.sh: avoid use of "post-receive" in messages The script is not running as a git post-receive hook anymore so avoid saying that it is. To that end change the intro to be more concise and generic (so it can apply to mirrors not just "push" projects) and avoid mentioning the "hooks/post-receive script". Also update the fatal error message to say "mail.sh" not "post-receive". Signed-off-by: Kyle J. McKay --- taskd/mail.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/taskd/mail.sh b/taskd/mail.sh index 82c9679..21e834e 100755 --- a/taskd/mail.sh +++ b/taskd/mail.sh @@ -343,9 +343,8 @@ generate_email_header() X-Git-Newrev: $newrev Auto-Submitted: auto-generated - This is an automated email from the git hooks/post-receive script. It was - generated because a ref change was pushed to the repository containing - the project $projectname. + This is an automated email generated because a ref change occurred in the + git repository for project $projectname. The $refname_type, $short_refname has been ${change_type}d EOF @@ -954,7 +953,7 @@ git_add_config core.abbrev=$habbr # variable. GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) if [ -z "$GIT_DIR" ]; then - echol >&2 "fatal: post-receive: GIT_DIR not set" + echol >&2 "fatal: mail.sh: GIT_DIR not set" exit 1 fi -- 2.11.4.GIT