Skip to content
Permalink
Browse files
Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
  • Loading branch information
dscho committed Oct 30, 2019
2 parents d1d8fc2 + e900821 commit 578744fc0ff512f0b1fba93212707b2f8d067b9e
Showing with 20 additions and 1 deletion.
  1. +2 −0 Documentation/config.txt
  2. +5 −0 Documentation/config/sendpack.txt
  3. +13 −1 send-pack.c
@@ -429,6 +429,8 @@ include::config/reset.txt[]

include::config/sendemail.txt[]

include::config/sendpack.txt[]

include::config/sequencer.txt[]

include::config/showbranch.txt[]
@@ -0,0 +1,5 @@
sendpack.sideband::
Allows to disable the side-band-64k capability for send-pack even
when it is advertised by the server. Makes it possible to work
around a limitation in the git for windows implementation together
with the dump git protocol. Defaults to true.
@@ -38,6 +38,16 @@ int option_parse_push_signed(const struct option *opt,
die("bad %s argument: %s", opt->long_name, arg);
}

static int config_use_sideband = 1;

static int send_pack_config(const char *var, const char *value, void *unused)
{
if (!strcmp("sendpack.sideband", var))
config_use_sideband = git_config_bool(var, value);

return 0;
}

static void feed_object(const struct object_id *oid, FILE *fh, int negative)
{
if (negative &&
@@ -391,14 +401,16 @@ int send_pack(struct send_pack_args *args,
const char *push_cert_nonce = NULL;
struct packet_reader reader;

git_config(send_pack_config, NULL);

/* Does the other end support the reporting? */
if (server_supports("report-status"))
status_report = 1;
if (server_supports("delete-refs"))
allow_deleting_refs = 1;
if (server_supports("ofs-delta"))
args->use_ofs_delta = 1;
if (server_supports("side-band-64k"))
if (config_use_sideband && server_supports("side-band-64k"))
use_sideband = 1;
if (server_supports("quiet"))
quiet_supported = 1;

0 comments on commit 578744f

Please sign in to comment.