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 /builtin | |
| parent | Merge branch 'fc/oid-quietly-parse-upstream' (diff) | |
| parent | git_connect(): fix corner cases in downgrading v2 to v0 (diff) | |
| download | git-f879501ad08b228797f5473092186900828681d5.tar.gz git-f879501ad08b228797f5473092186900828681d5.zip | |
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 'builtin')
| -rw-r--r-- | builtin/fetch-pack.c | 4 | ||||
| -rw-r--r-- | builtin/send-pack.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 702c9a3397..d1a4306da3 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -213,8 +213,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) int flags = args.verbose ? CONNECT_VERBOSE : 0; if (args.diag_url) flags |= CONNECT_DIAG_URL; - conn = git_connect(fd, dest, args.uploadpack, - flags); + conn = git_connect(fd, dest, "git-upload-pack", + args.uploadpack, flags); if (!conn) return args.diag_url ? 0 : 1; } diff --git a/builtin/send-pack.c b/builtin/send-pack.c index fb5b2bad2c..91c03df3f3 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -274,7 +274,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) fd[0] = 0; fd[1] = 1; } else { - conn = git_connect(fd, dest, receivepack, + conn = git_connect(fd, dest, "git-receive-pack", receivepack, args.verbose ? CONNECT_VERBOSE : 0); } |