diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-03-28 10:51:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 10:51:52 -0700 |
commit | f879501ad08b228797f5473092186900828681d5 (patch) | |
tree | c48bcb2ba63e3101da8d9f24e5a242e4538589d8 /transport.c | |
parent | 8069aa01cd83d187813117b34ed718245d56eac9 (diff) | |
parent | eaa0fd658442c2b83dfad918d636bba3ca3b4087 (diff) | |
download | git-f879501ad08b228797f5473092186900828681d5.tar.gz |
Merge branch 'jk/fix-proto-downgrade-to-v0'
Transports that do not support protocol v2 did not correctly fall
back to protocol v0 under certain conditions, which has been
corrected.
* jk/fix-proto-downgrade-to-v0:
git_connect(): fix corner cases in downgrading v2 to v0
Diffstat (limited to 'transport.c')
-rw-r--r-- | transport.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/transport.c b/transport.c index 906dbad5a0..fa9bc3be08 100644 --- a/transport.c +++ b/transport.c @@ -279,8 +279,12 @@ static int connect_setup(struct transport *transport, int for_push) } data->conn = git_connect(data->fd, transport->url, - for_push ? data->options.receivepack : - data->options.uploadpack, + for_push ? + "git-receive-pack" : + "git-upload-pack", + for_push ? + data->options.receivepack : + data->options.uploadpack, flags); return 0; @@ -914,7 +918,7 @@ static int connect_git(struct transport *transport, const char *name, { struct git_transport_data *data = transport->data; data->conn = git_connect(data->fd, transport->url, - executable, 0); + name, executable, 0); fd[0] = data->fd[0]; fd[1] = data->fd[1]; return 0; |