kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/receive-pack: explicitly pass packfile fd 

When processing the incoming packfile in git-receive-pack(1), `unpack()`
assumes it should always read it from stdin. In preparation for
`unpack()` logic being moved behind a generic ODB transaction interface,
update the function signature to take the an explicit fd provided by
callers to read the incoming packfile from instead. Call sites are
updated accordingly.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Justin Tobler 2026-08-20 18:49:38 -05:00 committed by Junio C Hamano
parent 429dd07aa0
commit 8e84d34da2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/receive-pack.c
View File

@ -2292,9 +2292,9 @@ static void read_push_options(struct packet_reader *reader,
}
}

static const char *parse_pack_header(struct pack_header *hdr)
static const char *parse_pack_header(struct pack_header *hdr, int pack_fd)
{
switch (read_pack_header(0, hdr)) {
switch (read_pack_header(pack_fd, hdr)) {
case PH_ERROR_EOF:
return "eof before pack header was fully read";

@ -2340,8 +2340,8 @@ struct unpack_opts {
int quiet;
};

static int unpack(struct odb_transaction *transaction, struct strbuf *err_msg,
const struct unpack_opts *opts)
static int unpack(struct odb_transaction *transaction, int pack_fd,
struct strbuf *err_msg, const struct unpack_opts *opts)
{
struct pack_header hdr;
const char *hdr_err;
@ -2349,7 +2349,7 @@ static int unpack(struct odb_transaction *transaction, struct strbuf *err_msg,
struct child_process child = CHILD_PROCESS_INIT;
int err_fd = opts->err_fd;

hdr_err = parse_pack_header(&hdr);
hdr_err = parse_pack_header(&hdr, pack_fd);
if (hdr_err) {
if (err_fd > 0)
close(err_fd);
@ -2376,6 +2376,7 @@ static int unpack(struct odb_transaction *transaction, struct strbuf *err_msg,
strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX,
(uintmax_t)opts->max_input_size);
child.no_stdout = 1;
child.in = pack_fd;
child.err = err_fd;
child.git_cmd = 1;
status = run_command(&child);
@ -2410,6 +2411,7 @@ static int unpack(struct odb_transaction *transaction, struct strbuf *err_msg,
strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX,
(uintmax_t)opts->max_input_size);
child.out = -1;
child.in = pack_fd;
child.err = err_fd;
child.git_cmd = 1;
status = start_command(&child);
@ -2461,7 +2463,7 @@ static int unpack_with_sideband(struct odb_transaction *transaction,
int ret;

if (!use_sideband)
return unpack(transaction, err_msg, &opts);
return unpack(transaction, 0, err_msg, &opts);

use_keepalive = KEEPALIVE_AFTER_NUL;
memset(&muxer, 0, sizeof(muxer));
@ -2471,7 +2473,7 @@ static int unpack_with_sideband(struct odb_transaction *transaction,
return 0;

opts.err_fd = muxer.in;
ret = unpack(transaction, err_msg, &opts);
ret = unpack(transaction, 0, err_msg, &opts);

finish_async(&muxer);
return ret;