Skip to content

Commit 092b9e4

Browse files
t-bGit for Windows Build Agent
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 05e9d76 commit 092b9e4

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
@@ -3053,3 +3053,9 @@ web.browser::
30533053
Specify a web browser that may be used by some commands.
30543054
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
30553055
may use it.
3056+
3057+
sendpack.sideband::
3058+
Allows to disable the side-band-64k capability for send-pack even
3059+
when it is advertised by the server. Makes it possible to work
3060+
around a limitation in the git for windows implementation together
3061+
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
@@ -36,6 +36,16 @@ int option_parse_push_signed(const struct option *opt,
3636
die("bad %s argument: %s", opt->long_name, arg);
3737
}
3838

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

394+
git_config(send_pack_config, NULL);
395+
384396
/* Does the other end support the reporting? */
385397
if (server_supports("report-status"))
386398
status_report = 1;
387399
if (server_supports("delete-refs"))
388400
allow_deleting_refs = 1;
389401
if (server_supports("ofs-delta"))
390402
args->use_ofs_delta = 1;
391-
if (server_supports("side-band-64k"))
403+
if (config_use_sideband && server_supports("side-band-64k"))
392404
use_sideband = 1;
393405
if (server_supports("quiet"))
394406
quiet_supported = 1;

0 commit comments

Comments
 (0)