summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-09 10:45:53 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-09 10:45:53 -0800
commit9b5a272e7252332b3a1d6fef54df7626c9eef9c5 (patch)
treed16aab1eb6a6903c4af94968160822eae43dfa3d /contrib
parentf80b6de4eca9c4c4abfe9407736311de27726e53 (diff)
parent4b5f94cdde41a58ac893c0bfb3e04f235e53f9dc (diff)
downloadgit-9b5a272e7252332b3a1d6fef54df7626c9eef9c5.tar.gz
Merge branch 'maint'
* maint: contrib/hooks/post-receive-email: fix return values from prep_for_email
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/hooks/post-receive-email8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 85724bfc08..f99ea95850 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -144,13 +144,13 @@ prep_for_email()
short_refname=${refname##refs/remotes/}
echo >&2 "*** Push-update of tracking branch, $refname"
echo >&2 "*** - no email generated."
- exit 0
+ return 1
;;
*)
# Anything else (is there anything else?)
echo >&2 "*** Unknown type of update to $refname ($rev_type)"
echo >&2 "*** - no email generated"
- return 0
+ return 1
;;
esac
@@ -166,10 +166,10 @@ prep_for_email()
esac
echo >&2 "*** $config_name is not set so no email will be sent"
echo >&2 "*** for $refname update $oldrev->$newrev"
- return 0
+ return 1
fi
- return 1
+ return 0
}
#