Skip to content

Commit 11c75db

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 1ead675 commit 11c75db

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
@@ -2558,3 +2558,9 @@ web.browser::
25582558
Specify a web browser that may be used by some commands.
25592559
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
25602560
may use it.
2561+
2562+
sendpack.sideband::
2563+
Allows to disable the side-band-64k capability for send-pack even
2564+
when it is advertised by the server. Makes it possible to work
2565+
around a limitation in the git for windows implementation together
2566+
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
@@ -13,6 +13,16 @@
1313
#include "sha1-array.h"
1414
#include "gpg-interface.h"
1515

16+
static int config_use_sideband = 1;
17+
18+
static int send_pack_config(const char *var, const char *value, void *unused)
19+
{
20+
if (!strcmp("sendpack.sideband", var))
21+
config_use_sideband = git_config_bool(var, value);
22+
23+
return 0;
24+
}
25+
1626
static int feed_object(const unsigned char *sha1, int fd, int negative)
1727
{
1828
char buf[42];
@@ -331,14 +341,16 @@ int send_pack(struct send_pack_args *args,
331341
struct async demux;
332342
const char *push_cert_nonce = NULL;
333343

344+
git_config(send_pack_config, NULL);
345+
334346
/* Does the other end support the reporting? */
335347
if (server_supports("report-status"))
336348
status_report = 1;
337349
if (server_supports("delete-refs"))
338350
allow_deleting_refs = 1;
339351
if (server_supports("ofs-delta"))
340352
args->use_ofs_delta = 1;
341-
if (server_supports("side-band-64k"))
353+
if (config_use_sideband && server_supports("side-band-64k"))
342354
use_sideband = 1;
343355
if (server_supports("quiet"))
344356
quiet_supported = 1;

0 commit comments

Comments
 (0)