Skip to content

Commit 11c1504

Browse files
committed
Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
2 parents 98ad04e + df5aebf commit 11c1504

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

Documentation/config.txt

+2
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@ include::config/reset.txt[]
429429

430430
include::config/sendemail.txt[]
431431

432+
include::config/sendpack.txt[]
433+
432434
include::config/sequencer.txt[]
433435

434436
include::config/showbranch.txt[]

Documentation/config/sendpack.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
sendpack.sideband::
2+
Allows to disable the side-band-64k capability for send-pack even
3+
when it is advertised by the server. Makes it possible to work
4+
around a limitation in the git for windows implementation together
5+
with the dump git protocol. Defaults to true.

send-pack.c

+13-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ int option_parse_push_signed(const struct option *opt,
3838
die("bad %s argument: %s", opt->long_name, arg);
3939
}
4040

41+
static int config_use_sideband = 1;
42+
43+
static int send_pack_config(const char *var, const char *value, void *unused)
44+
{
45+
if (!strcmp("sendpack.sideband", var))
46+
config_use_sideband = git_config_bool(var, value);
47+
48+
return 0;
49+
}
50+
4151
static void feed_object(const struct object_id *oid, FILE *fh, int negative)
4252
{
4353
if (negative &&
@@ -391,14 +401,16 @@ int send_pack(struct send_pack_args *args,
391401
const char *push_cert_nonce = NULL;
392402
struct packet_reader reader;
393403

404+
git_config(send_pack_config, NULL);
405+
394406
/* Does the other end support the reporting? */
395407
if (server_supports("report-status"))
396408
status_report = 1;
397409
if (server_supports("delete-refs"))
398410
allow_deleting_refs = 1;
399411
if (server_supports("ofs-delta"))
400412
args->use_ofs_delta = 1;
401-
if (server_supports("side-band-64k"))
413+
if (config_use_sideband && server_supports("side-band-64k"))
402414
use_sideband = 1;
403415
if (server_supports("quiet"))
404416
quiet_supported = 1;

0 commit comments

Comments
 (0)