freshlybakedca.ke / git
Git fork
fork atom

send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS"

The "push_refs" function in the transport_vtable is the handler for
git-push operation. All the "push_refs" functions for different
transports (protocols) should have the same behavior, but the behavior
of "git_transport_push()" function for builtin_smart_vtable in
"transport.c" (which calls "send_pack()" in "send-pack.c") differs from
the handler of the HTTP protocol.

The "push_refs()" function for the HTTP protocol which calls the
"push_refs_with_push()" function in "transport-helper.c" will return 0
even when a bad REF_STATUS (such as REF_STATUS_REJECT_NONFASTFORWARD)
was found. But "send_pack()" for Git smart protocol will return -1 for
a bad REF_STATUS.

We cannot ignore bad REF_STATUS directly in the "send_pack()" function,
because the function is also used in "builtin/send-pack.c". So we add a
new non-zero error code "SEND_PACK_ERROR_REF_STATUS" for "send_pack()".

Ignore the specific error code in the "git_transport_push()" function to
have the same behavior as "push_refs()" for HTTP protocol. Note that
even though we ignore the error here, we'll ultimately still end up
detecting that a subset of refs was not pushed in `transport_push()`
because we eventually call `push_had_errors()` on the remote refs.

Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Jiang Xin and committed by
Junio C Hamano 3028db4a dd69a12e

+22 -7
unified split
+2 -7
send-pack.c
··· 632 632 reject_atomic_push(remote_refs, args->send_mirror); 633 633 error("atomic push failed for ref %s. status: %d", 634 634 ref->name, ref->status); 635 - ret = args->porcelain ? 0 : -1; 635 + ret = ERROR_SEND_PACK_BAD_REF_STATUS; 636 636 goto out; 637 637 } 638 638 /* else fallthrough */ ··· 763 763 if (ret < 0) 764 764 goto out; 765 765 766 - if (args->porcelain) { 767 - ret = 0; 768 - goto out; 769 - } 770 - 771 766 for (ref = remote_refs; ref; ref = ref->next) { 772 767 switch (ref->status) { 773 768 case REF_STATUS_NONE: ··· 775 770 case REF_STATUS_OK: 776 771 break; 777 772 default: 778 - ret = -1; 773 + ret = ERROR_SEND_PACK_BAD_REF_STATUS; 779 774 goto out; 780 775 } 781 776 }
+13
send-pack.h
··· 13 13 #define SEND_PACK_PUSH_CERT_IF_ASKED 1 14 14 #define SEND_PACK_PUSH_CERT_ALWAYS 2 15 15 16 + /* At least one reference has been rejected by the remote side. */ 17 + #define ERROR_SEND_PACK_BAD_REF_STATUS 1 18 + 16 19 struct send_pack_args { 17 20 const char *url; 18 21 unsigned verbose:1, ··· 36 39 int option_parse_push_signed(const struct option *opt, 37 40 const char *arg, int unset); 38 41 42 + /* 43 + * Compute a packfile and write it to a file descriptor. The `fd` array needs 44 + * to contain two file descriptors: `fd[0]` is the file descriptor used as 45 + * input for the packet reader, whereas `fd[1]` is the file descriptor the 46 + * packfile will be written to. 47 + * 48 + * Returns 0 on success, non-zero otherwise. Negative return values indicate a 49 + * generic error, whereas positive return values indicate specific error 50 + * conditions as documented with the `ERROR_SEND_PACK_*` constants. 51 + */ 39 52 int send_pack(struct repository *r, struct send_pack_args *args, 40 53 int fd[], struct child_process *conn, 41 54 struct ref *remote_refs, struct oid_array *extra_have);
+7
transport.c
··· 934 934 case protocol_v0: 935 935 ret = send_pack(the_repository, &args, data->fd, data->conn, remote_refs, 936 936 &data->extra_have); 937 + /* 938 + * Ignore the specific error code to maintain consistent behavior 939 + * with the "push_refs()" function across different transports, 940 + * such as "push_refs_with_push()" for HTTP protocol. 941 + */ 942 + if (ret == ERROR_SEND_PACK_BAD_REF_STATUS) 943 + ret = 0; 937 944 break; 938 945 case protocol_unknown_version: 939 946 BUG("unknown protocol version");