From: Jonathan Tan <jonathantanmy@google.com> To: git@vger.kernel.org Cc: Jonathan Tan <jonathantanmy@google.com> Subject: [PATCH 1/6] fetch-pack: buffer object-format with other args Date: Thu, 8 Apr 2021 18:09:58 -0700 [thread overview] Message-ID: <86e4ce0e8d9665b1c5a2b30173be4afffe0a0abd.1617929278.git.jonathantanmy@google.com> (raw) In-Reply-To: <cover.1617929278.git.jonathantanmy@google.com> In send_fetch_request(), "object-format" is written directly to the file descriptor, as opposed to the other arguments, which are buffered. Buffer "object-format" as well. "object-format" must be buffered; in particular, it must appear after "command=fetch" in the request. This divergence was introduced in 4b831208bb ("fetch-pack: parse and advertise the object-format capability", 2020-05-27), perhaps as an oversight (the surrounding code at the point of this commit has already been using a request buffer.) Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- fetch-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fetch-pack.c b/fetch-pack.c index 6e68276aa3..2318ebe680 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1251,7 +1251,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, if (hash_algo_by_ptr(the_hash_algo) != hash_algo) die(_("mismatched algorithms: client %s; server %s"), the_hash_algo->name, hash_name); - packet_write_fmt(fd_out, "object-format=%s", the_hash_algo->name); + packet_buf_write(&req_buf, "object-format=%s", the_hash_algo->name); } else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) { die(_("the server does not support algorithm '%s'"), the_hash_algo->name); -- 2.31.1.295.g9ea45b61b8-goog
next prev parent reply other threads:[~2021-04-09 1:10 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-09 1:09 [PATCH 0/6] Push negotiation Jonathan Tan 2021-04-09 1:09 ` Jonathan Tan [this message] 2021-04-09 4:49 ` [PATCH 1/6] fetch-pack: buffer object-format with other args Junio C Hamano 2021-04-09 16:24 ` Jonathan Tan 2021-04-09 1:09 ` [PATCH 2/6] fetch-pack: refactor process_acks() Jonathan Tan 2021-04-09 5:08 ` Junio C Hamano 2021-05-03 16:30 ` Derrick Stolee 2021-04-09 1:10 ` [PATCH 3/6] fetch-pack: refactor add_haves() Jonathan Tan 2021-04-09 5:20 ` Junio C Hamano 2021-04-09 1:10 ` [PATCH 4/6] fetch-pack: refactor command and capability write Jonathan Tan 2021-04-09 5:27 ` Junio C Hamano 2021-04-09 1:10 ` [PATCH 5/6] fetch: teach independent negotiation (no packfile) Jonathan Tan 2021-04-09 5:41 ` Junio C Hamano 2021-04-09 16:38 ` Jonathan Tan 2021-05-03 15:25 ` Derrick Stolee 2021-05-03 15:40 ` Derrick Stolee 2021-05-03 21:52 ` Jonathan Tan 2021-04-09 1:10 ` [PATCH 6/6] send-pack: support push negotiation Jonathan Tan 2021-05-03 15:35 ` Derrick Stolee 2021-05-03 22:02 ` Jonathan Tan 2021-05-04 17:26 ` Derrick Stolee 2021-04-30 5:42 ` [PATCH 0/6] Push negotiation Junio C Hamano 2021-04-30 17:33 ` Derrick Stolee 2021-05-04 21:15 ` [PATCH v2 0/5] " Jonathan Tan 2021-05-04 21:15 ` [PATCH v2 1/5] fetch-pack: refactor process_acks() Jonathan Tan 2021-05-04 21:15 ` [PATCH v2 2/5] fetch-pack: refactor add_haves() Jonathan Tan 2021-05-04 21:16 ` [PATCH v2 3/5] fetch-pack: refactor command and capability write Jonathan Tan 2021-05-04 21:16 ` [PATCH v2 4/5] fetch: teach independent negotiation (no packfile) Jonathan Tan 2021-05-05 1:53 ` Junio C Hamano 2021-05-05 16:42 ` Derrick Stolee 2021-05-06 2:12 ` Junio C Hamano 2021-05-05 16:44 ` Derrick Stolee 2021-05-04 21:16 ` [PATCH v2 5/5] send-pack: support push negotiation Jonathan Tan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=86e4ce0e8d9665b1c5a2b30173be4afffe0a0abd.1617929278.git.jonathantanmy@google.com \ --to=jonathantanmy@google.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 1/6] fetch-pack: buffer object-format with other args' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).