summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Raison <alan@theraisons.me.uk>2010-12-09 16:03:05 +0000
committerJunio C Hamano <gitster@pobox.com>2010-12-09 09:34:11 -0800
commit8828aa3418792ff9deb2ab264c6934a5d0bb15e0 (patch)
treef9d526f1b00f4aafbbfa32870f2dcbfd5063a417
parentf34e9edc7bbb41c52ff6a17dbffbef3d4979ee25 (diff)
downloadgit-8828aa3418792ff9deb2ab264c6934a5d0bb15e0.tar.gz
contrib/hooks/post-receive-email: fix return values from prep_for_email
The function was returning 0 for failure and 1 for success which was breaking the logic in the main loop. It now also returns in all cases, rather than exiting. Signed-off-by: Alan Raison <alan@theraisons.me.uk> Acked-by: Kevin P. Fleming <kpfleming@digium.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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
}
#