3028db4af2
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>
57 lines
1.5 KiB
C
57 lines
1.5 KiB
C
#ifndef SEND_PACK_H
|
|
#define SEND_PACK_H
|
|
|
|
#include "string-list.h"
|
|
|
|
struct child_process;
|
|
struct oid_array;
|
|
struct ref;
|
|
struct repository;
|
|
|
|
/* Possible values for push_cert field in send_pack_args. */
|
|
#define SEND_PACK_PUSH_CERT_NEVER 0
|
|
#define SEND_PACK_PUSH_CERT_IF_ASKED 1
|
|
#define SEND_PACK_PUSH_CERT_ALWAYS 2
|
|
|
|
/* At least one reference has been rejected by the remote side. */
|
|
#define ERROR_SEND_PACK_BAD_REF_STATUS 1
|
|
|
|
struct send_pack_args {
|
|
const char *url;
|
|
unsigned verbose:1,
|
|
quiet:1,
|
|
porcelain:1,
|
|
progress:1,
|
|
send_mirror:1,
|
|
force_update:1,
|
|
use_thin_pack:1,
|
|
use_ofs_delta:1,
|
|
dry_run:1,
|
|
/* One of the SEND_PACK_PUSH_CERT_* constants. */
|
|
push_cert:2,
|
|
stateless_rpc:1,
|
|
atomic:1,
|
|
disable_bitmaps:1;
|
|
const struct string_list *push_options;
|
|
};
|
|
|
|
struct option;
|
|
int option_parse_push_signed(const struct option *opt,
|
|
const char *arg, int unset);
|
|
|
|
/*
|
|
* Compute a packfile and write it to a file descriptor. The `fd` array needs
|
|
* to contain two file descriptors: `fd[0]` is the file descriptor used as
|
|
* input for the packet reader, whereas `fd[1]` is the file descriptor the
|
|
* packfile will be written to.
|
|
*
|
|
* Returns 0 on success, non-zero otherwise. Negative return values indicate a
|
|
* generic error, whereas positive return values indicate specific error
|
|
* conditions as documented with the `ERROR_SEND_PACK_*` constants.
|
|
*/
|
|
int send_pack(struct repository *r, struct send_pack_args *args,
|
|
int fd[], struct child_process *conn,
|
|
struct ref *remote_refs, struct oid_array *extra_have);
|
|
|
|
#endif
|