Stefan Beller <sbel...@google.com> writes:
> This renames ref_update_to_be_sent to check_to_send_update and inverts
> the meaning of the return value. Having the return value inverted we
> can have different values for the error codes. This is useful in a
> later patch when we want to know if we hit the CHECK_REF_STATUS_REJECTED
> case.
Makes sense; I would have defined these constants negative, but that
can be cleaned up if somebody cares deeply enough later.
Will queue. Thanks.
>
> Signed-off-by: Stefan Beller <sbel...@google.com>
> ---
>
> Notes:
> This was introduced with the [PATCHv2] series.
> Changes v2 -> v3:
>
> * Rename to check_to_send_update
> * Negative error values.
> * errors values are #define'd and not raw numbers.
>
> send-pack.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/send-pack.c b/send-pack.c
> index e2bdd89..77e4201 100644
> --- a/send-pack.c
> +++ b/send-pack.c
> @@ -190,10 +190,13 @@ static void advertise_shallow_grafts_buf(struct strbuf
> *sb)
> for_each_commit_graft(advertise_shallow_grafts_cb, sb);
> }
>
> -static int ref_update_to_be_sent(const struct ref *ref, const struct
> send_pack_args *args)
> +#define CHECK_REF_NO_PUSH 1
> +#define CHECK_REF_STATUS_REJECTED 2
> +#define CHECK_REF_UPTODATE 3
> +static int check_to_send_update(const struct ref *ref, const struct
> send_pack_args *args)
> {
> if (!ref->peer_ref && !args->send_mirror)
> - return 0;
> + return -CHECK_REF_NO_PUSH;
>
> /* Check for statuses set by set_ref_status_for_push() */
> switch (ref->status) {
> @@ -203,10 +206,11 @@ static int ref_update_to_be_sent(const struct ref *ref,
> const struct send_pack_a
> case REF_STATUS_REJECT_NEEDS_FORCE:
> case REF_STATUS_REJECT_STALE:
> case REF_STATUS_REJECT_NODELETE:
> + return -CHECK_REF_STATUS_REJECTED;
> case REF_STATUS_UPTODATE:
> - return 0;
> + return -CHECK_REF_UPTODATE;
> default:
> - return 1;
> + return 0;
> }
> }
>
> @@ -250,7 +254,7 @@ static int generate_push_cert(struct strbuf *req_buf,
> strbuf_addstr(&cert, "\n");
>
> for (ref = remote_refs; ref; ref = ref->next) {
> - if (!ref_update_to_be_sent(ref, args))
> + if (check_to_send_update(ref, args) < 0)
> continue;
> update_seen = 1;
> strbuf_addf(&cert, "%s %s %s\n",
> @@ -369,7 +373,7 @@ int send_pack(struct send_pack_args *args,
> * the pack data.
> */
> for (ref = remote_refs; ref; ref = ref->next) {
> - if (!ref_update_to_be_sent(ref, args))
> + if (check_to_send_update(ref, args) < 0)
> continue;
>
> if (!ref->deletion)
> @@ -390,7 +394,7 @@ int send_pack(struct send_pack_args *args,
> if (args->dry_run || args->push_cert)
> continue;
>
> - if (!ref_update_to_be_sent(ref, args))
> + if (check_to_send_update(ref, args) < 0)
> continue;
>
> old_hex = sha1_to_hex(ref->old_sha1);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
