mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-11 08:30:32 -05:00
a6d92c48e4
When push.negotiate is enabled, 'git push' spawns a child 'git fetch --negotiate-only' process to find common commits. Pass --negotiation-include and --negotiation-restrict options from the 'remote.<name>.negotiationInclude' and 'remote.<name>.negotiationRestrict' config keys to this child process. When negotiationRestrict is configured, it replaces the default behavior of using all remote refs as negotiation tips. This allows the user to control which local refs are used for push negotiation. When negotiationInclude is configured, the specified ref patterns are passed as --negotiation-include to ensure their tips are always sent as 'have' lines during push negotiation. Reviewed-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.6 KiB
C
59 lines
1.6 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;
|
|
const struct string_list *negotiation_include;
|
|
const struct string_list *negotiation_restrict;
|
|
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
|