Skip to content

Commit 98671c1

Browse files
t-bdscho
authored andcommitted
Config option to disable side-band-64k for transport
Since commit 0c499ea the send-pack builtin uses the side-band-64k capability if advertised by the server. Unfortunately this breaks pushing over the dump git protocol if used over a network connection. The detailed reasons for this breakage are (by courtesy of Jeff Preshing, quoted from ttps://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ): ---------------------------------------------------------------------------- MinGW wraps Windows sockets in CRT file descriptors in order to mimic the functionality of POSIX sockets. This causes msvcrt.dll to treat sockets as Installable File System (IFS) handles, calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on them. This approach works well in simple cases on recent versions of Windows, but does not support all usage patterns. In particular, using this approach, any attempt to read & write concurrently on the same socket (from one or more processes) will deadlock in a scenario where the read waits for a response from the server which is only invoked after the write. This is what send_pack currently attempts to do in the use_sideband codepath. ---------------------------------------------------------------------------- The new config option "sendpack.sideband" allows to override the side-band-64k capability of the server, and thus makes the dump git protocol work. Other transportation methods like ssh and http/https still benefit from the sideband channel, therefore the default value of "sendpack.sideband" is still true. Signed-off-by: Thomas Braun <[email protected]>
1 parent 21c1e6b commit 98671c1

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

Documentation/config.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3380,3 +3380,9 @@ web.browser::
33803380
Specify a web browser that may be used by some commands.
33813381
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
33823382
may use it.
3383+
3384+
sendpack.sideband::
3385+
Allows to disable the side-band-64k capability for send-pack even
3386+
when it is advertised by the server. Makes it possible to work
3387+
around a limitation in the git for windows implementation together
3388+
with the dump git protocol. Defaults to true.

send-pack.c

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

40+
static int config_use_sideband = 1;
41+
42+
static int send_pack_config(const char *var, const char *value, void *unused)
43+
{
44+
if (!strcmp("sendpack.sideband", var))
45+
config_use_sideband = git_config_bool(var, value);
46+
47+
return 0;
48+
}
49+
4050
static void feed_object(const unsigned char *sha1, FILE *fh, int negative)
4151
{
4252
if (negative && !has_sha1_file(sha1))
@@ -400,14 +410,16 @@ int send_pack(struct send_pack_args *args,
400410
struct async demux;
401411
const char *push_cert_nonce = NULL;
402412

413+
git_config(send_pack_config, NULL);
414+
403415
/* Does the other end support the reporting? */
404416
if (server_supports("report-status"))
405417
status_report = 1;
406418
if (server_supports("delete-refs"))
407419
allow_deleting_refs = 1;
408420
if (server_supports("ofs-delta"))
409421
args->use_ofs_delta = 1;
410-
if (server_supports("side-band-64k"))
422+
if (config_use_sideband && server_supports("side-band-64k"))
411423
use_sideband = 1;
412424
if (server_supports("quiet"))
413425
quiet_supported = 1;

0 commit comments

Comments
 (0)