Skip to content

Commit 239291c

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 72d6970 commit 239291c

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
@@ -3454,3 +3454,9 @@ worktree.guessRemote::
34543454
such a branch exists, it is checked out and set as "upstream"
34553455
for the new branch. If no such match can be found, it falls
34563456
back to creating a new branch from the current HEAD.
3457+
3458+
sendpack.sideband::
3459+
Allows to disable the side-band-64k capability for send-pack even
3460+
when it is advertised by the server. Makes it possible to work
3461+
around a limitation in the git for windows implementation together
3462+
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))
@@ -389,14 +399,16 @@ int send_pack(struct send_pack_args *args,
389399
struct async demux;
390400
const char *push_cert_nonce = NULL;
391401

402+
git_config(send_pack_config, NULL);
403+
392404
/* Does the other end support the reporting? */
393405
if (server_supports("report-status"))
394406
status_report = 1;
395407
if (server_supports("delete-refs"))
396408
allow_deleting_refs = 1;
397409
if (server_supports("ofs-delta"))
398410
args->use_ofs_delta = 1;
399-
if (server_supports("side-band-64k"))
411+
if (config_use_sideband && server_supports("side-band-64k"))
400412
use_sideband = 1;
401413
if (server_supports("quiet"))
402414
quiet_supported = 1;

0 commit comments

Comments
 (0)