Re: [PATCH] Corrected return values in post-receive-email.prep_for_email

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 7, 2010, 19:34 UTC
Message-ID: <7v1v5tqswl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <002501cb962c$5fa3aa40$1eeafec0$@me.uk>

"Alan Raison" <alan@theraisons.me.uk> writes:

> ---
>  contrib/hooks/post-receive-email |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

No sign-off, no description.

This is a regression introduced by 53cad69 (post-receive-email: ensure sent messages are not empty, 2010-09-10), I think.

Show 12 quoted lines

> diff --git a/contrib/hooks/post-receive-email
> b/contrib/hooks/post-receive-email
> index 85724bf..020536d 100755
> --- a/contrib/hooks/post-receive-email
> +++ b/contrib/hooks/post-receive-email
> @@ -150,7 +150,7 @@ prep_for_email()
>  			# 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

This used to "exit 1" before 53cad69 and I agree with the patch that signalling error with "return 1" is the right thing to do here.

Show 10 quoted lines

>  			;;
>  	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

This used to "exit 0" before 53cad69 to cause the program stop before sending mails. Again, I agree with the patch that signalling error is the right thing to do here.

>  	fi
>  
> -	return 1
> +	return 0

And this obviously is correct.

Kevin, care to review and Ack? Alan, care to add a few lines of patch description and sign-off?

Thanks.