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>
This commit is contained in:

committed by
Junio C Hamano

parent
f34e9edc7b
commit
8828aa3418
@ -144,13 +144,13 @@ prep_for_email()
|
|||||||
short_refname=${refname##refs/remotes/}
|
short_refname=${refname##refs/remotes/}
|
||||||
echo >&2 "*** Push-update of tracking branch, $refname"
|
echo >&2 "*** Push-update of tracking branch, $refname"
|
||||||
echo >&2 "*** - no email generated."
|
echo >&2 "*** - no email generated."
|
||||||
exit 0
|
return 1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# Anything else (is there anything else?)
|
# Anything else (is there anything else?)
|
||||||
echo >&2 "*** Unknown type of update to $refname ($rev_type)"
|
echo >&2 "*** Unknown type of update to $refname ($rev_type)"
|
||||||
echo >&2 "*** - no email generated"
|
echo >&2 "*** - no email generated"
|
||||||
return 0
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -166,10 +166,10 @@ prep_for_email()
|
|||||||
esac
|
esac
|
||||||
echo >&2 "*** $config_name is not set so no email will be sent"
|
echo >&2 "*** $config_name is not set so no email will be sent"
|
||||||
echo >&2 "*** for $refname update $oldrev->$newrev"
|
echo >&2 "*** for $refname update $oldrev->$newrev"
|
||||||
return 0
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 1
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user