From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6318A3B9931 for ; Wed, 8 Jul 2026 04:14:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783484074; cv=none; b=Epmdt1/QbcX2gMTCjSpF9TcdqdPkSKmSsOhzoUmkplgQ7AH8x6U+G/KO5HpazQ+dnPBsDOOIZTn/MPH8zIsCsypElD3CI+IJ6bCZLQ2gqSAinXAREWgInOSF7JZ9oLiyCXyhCiTZsgGz8stlhvTZVzeF/z6Q3z4g55SKvoglKPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783484074; c=relaxed/simple; bh=ZPMusmpVJ+9p1ZI2K2IbEWU1Z3WFAPLrwpKdzoxBuc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RtMiZ8v1GcaV0yK4ApWfggzwk/kUOOHvjKogqyJyoLqd0a1pEOyZRRLjD0quxqNdFqKEZbg2eut/rtMVAtRSGuTtyLN7a4Gn/ATmb0hsw1EmLa6VsSVwDcP/Skuwut9ofmNe43a/zamv5/yJ4rlSG/ROzRrZogO0V7nPOEZTvVM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k8H7Ey7j; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k8H7Ey7j" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-48a0ca07c38so186046b6e.2 for ; Tue, 07 Jul 2026 21:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783484071; x=1784088871; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=CmKmd5KMu8Ts9gO+brf0pjkR9F7NRby5t46IUKvQQ74=; b=k8H7Ey7jI2TmXisV1QIV3hlKNuWjy6VguqfOZnPdCJAfhk/u/WUTC7cVZpoDGlOS0p nBg4IR0TamEDrbWyAk668mEZjGzq/kTJJ6P74we6gaOzBwvDK9ot1I0m9l9zmM4mpFJp SU8oNnvAZy+biSyoQNggGEtLl6xiYsO8dmHAu6cVI+ZsDnNx9Zz6OvzgW/ThFx51SEtv R2PctVURXkuOBfkw1/vMQurWzA1Thev42dykXRXw6uOlwQx6wgiKJ7J1R6iP6GAN5PIZ qPlUMVooSfYfbbX6OeKWqKJTBY4CtEN3+s1+0QgUFLqDsVj1FqfWlLWv1mKnc7jGDRZj /b7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783484071; x=1784088871; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=CmKmd5KMu8Ts9gO+brf0pjkR9F7NRby5t46IUKvQQ74=; b=TvknB3ODohHVnl9UH5U70+gq2/RHWP6dih67V/kxVeXRg21jsCl5XK+EzdhipLgel/ b1itz4C5dZzm8v4E1YB+G9Io+IRIcPg9XD6yNCHP3mNR7PYRv1oBdX/oy0HQpYQzAkv4 UXuw0tpNIeE9qD5VOr9Z8/Ft/6D+ElWYQ/VpnI60VNbGykDnAsDj4kHnM9r4t4vyQOjW NISooY9RStIAdOaJMD42cAm9MKwsp3xSnoeELtEcEhnXte9+mhe5IXHxR9w3RQV8ckNQ xI+18iyuv1cExbHbkudlvL8Fof4oOftva50r7ZeRXEBTuB/9OCRIRna5fF07iuY0jiLr S53w== X-Gm-Message-State: AOJu0YwwWlQSkcAgeaoOmQLeBUC2TrY8NW3xr4JluN/J2bKkB5udmEM8 wpUc0DoYZ+c8nvmhMlKiVgHdAbD2xLuHUDkTZ4Laosevo25DnZeOTHyTd8nbAA== X-Gm-Gg: AfdE7cmX/qpXS/bdjd6j7mdoMSXEjRKrwZYElfgWyVchkz2Pzxr4a7R8wes3SEJRvFp Sba+Hw1c5Noc/RUe/nd6DG0Vp9MkoBK4u8u9adQxW8rQt016nezxhIXN84c2iiC3jl//Kr+APkn wrOfch8OkaGw8poVanMs4pZtFLbKPlgaW1jZPFBtVsCDAjzML/L+w9pGu9ifx+MNifb7MJjx+Z/ O0rO0Kd9Fv2czQDur/l+zeKjOeMba2FMsXOM+6rPSfGUpGqeCH6f6fWnuw89wfa2TAG5OLVAXi8 TRItwrqh691jfExLWCadZjLe0QLso3o8pox5l+qLUsSJK24/4SL2I2OP21Fc/ylNBcZQHq+kIH7 zVnjSf9Mz43efU7yGPD1Xrv5gMlbDPNa8GZhLfBVg75JyqE+MNgexRY5XKKdYlOtAZ3f0pqd3X4 2VbvyRWLkzMEQjIU/14uQX X-Received: by 2002:a05:6808:1b20:b0:495:fd95:5fa9 with SMTP id 5614622812f47-4a2047e2a82mr502327b6e.33.1783484071226; Tue, 07 Jul 2026 21:14:31 -0700 (PDT) Received: from denethor.localdomain ([136.51.44.64]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4a1acc83099sm931498b6e.2.2026.07.07.21.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 21:14:30 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, gitster@pobox.com, Justin Tobler Subject: [PATCH v2 11/11] builtin/receive-pack: stage incoming objects via ODB transactions Date: Tue, 7 Jul 2026 23:14:12 -0500 Message-ID: <20260708041412.1157499-12-jltobler@gmail.com> X-Mailer: git-send-email 2.55.0.122.gf85a7e6620 In-Reply-To: <20260708041412.1157499-1-jltobler@gmail.com> References: <20260624041920.2601961-1-jltobler@gmail.com> <20260708041412.1157499-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Objects received by git-receive-pack(1) are quarantined in a temporary "incoming" directory and migrated into the object database prior to the reference updates. The quarantine is currently managed through `tmp_objdir` directly. In a pluggable ODB future, how exactly an object gets written to a transaction may vary for a given ODB source. Refactor git-receive-pack(1) to use the ODB transaction interfaces to manage the object staging area in a more agnostic manner accordingly. Note that the ODB transaction is now responsible for managing the primary and alternate ODBs for the repository. One small change as a result is that the temporary directory is now applied as the primary ODB in the main process instead of an alternate. This does not change anything for git-receive-pack(1) though because it only needs access to the newly written objects and doesn't care how exactly it is set up. Signed-off-by: Justin Tobler --- builtin/receive-pack.c | 68 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 50bc05c70c..8b8c20dc1a 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -37,7 +37,6 @@ #include "sigchain.h" #include "string-list.h" #include "strvec.h" -#include "tmp-objdir.h" #include "trace.h" #include "trace2.h" #include "version.h" @@ -112,8 +111,6 @@ static enum { } use_keepalive; static int keepalive_in_sec = 5; -static struct tmp_objdir *tmp_objdir; - static struct proc_receive_ref { unsigned int want_add:1, want_delete:1, @@ -926,6 +923,7 @@ static void receive_hook_feed_state_free(void *data) static int run_receive_hook(struct command *commands, const char *hook_name, int skip_broken, + struct odb_transaction *transaction, const struct string_list *push_options) { struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT; @@ -959,8 +957,8 @@ static int run_receive_hook(struct command *commands, strvec_push(&opt.env, "GIT_PUSH_OPTION_COUNT"); } - if (tmp_objdir) - strvec_pushv(&opt.env, tmp_objdir_env(tmp_objdir)); + if (transaction) + odb_transaction_env(transaction, &opt.env); prepare_push_cert_sha1(&opt); @@ -1789,24 +1787,30 @@ static const struct object_id *command_singleton_iterator(void *cb_data) } static void set_connectivity_errors(struct command *commands, - struct shallow_info *si) + struct shallow_info *si, + struct odb_transaction *transaction) { struct command *cmd; for (cmd = commands; cmd; cmd = cmd->next) { struct command *singleton = cmd; struct check_connected_options opt = CHECK_CONNECTED_INIT; + struct strvec env = STRVEC_INIT; if (shallow_update && si->shallow_ref[cmd->index]) /* to be checked in update_shallow_ref() */ continue; - opt.env = tmp_objdir_env(tmp_objdir); + odb_transaction_env(transaction, &env); + opt.env = env.v; + if (!check_connected(command_singleton_iterator, &singleton, &opt)) continue; cmd->error_string = "missing necessary objects"; + + strvec_clear(&env); } } @@ -2027,6 +2031,7 @@ static void execute_commands_atomic(struct command *commands, static void execute_commands(struct command *commands, const char *unpacker_error, struct shallow_info *si, + struct odb_transaction *transaction, const struct string_list *push_options) { struct check_connected_options opt = CHECK_CONNECTED_INIT; @@ -2043,6 +2048,8 @@ static void execute_commands(struct command *commands, } if (!skip_connectivity_check) { + struct strvec env = STRVEC_INIT; + if (use_sideband) { memset(&muxer, 0, sizeof(muxer)); muxer.proc = copy_to_sideband; @@ -2056,14 +2063,17 @@ static void execute_commands(struct command *commands, data.si = si; opt.err_fd = err_fd; opt.progress = err_fd && !quiet; - opt.env = tmp_objdir_env(tmp_objdir); + odb_transaction_env(transaction, &env); + opt.env = env.v; opt.exclude_hidden_refs_section = "receive"; if (check_connected(iterate_receive_command_list, &data, &opt)) - set_connectivity_errors(commands, si); + set_connectivity_errors(commands, si, transaction); if (use_sideband) finish_async(&muxer); + + strvec_clear(&env); } reject_updates_to_hidden(commands); @@ -2084,7 +2094,7 @@ static void execute_commands(struct command *commands, } } - if (run_receive_hook(commands, "pre-receive", 0, push_options)) { + if (run_receive_hook(commands, "pre-receive", 0, transaction, push_options)) { for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) cmd->error_string = "pre-receive hook declined"; @@ -2105,14 +2115,13 @@ static void execute_commands(struct command *commands, * Now we'll start writing out refs, which means the objects need * to be in their final positions so that other processes can see them. */ - if (tmp_objdir_migrate(tmp_objdir) < 0) { + if (odb_transaction_commit(transaction)) { for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) cmd->error_string = "unable to migrate objects to permanent storage"; } return; } - tmp_objdir = NULL; check_aliased_updates(commands); @@ -2325,7 +2334,8 @@ static void push_header_arg(struct strvec *args, struct pack_header *hdr) ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries)); } -static const char *unpack(int err_fd, struct shallow_info *si) +static const char *unpack(int err_fd, struct shallow_info *si, + struct odb_transaction *transaction) { struct pack_header hdr; const char *hdr_err; @@ -2350,20 +2360,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) strvec_push(&child.args, alt_shallow_file); } - tmp_objdir = tmp_objdir_create(the_repository, "incoming"); - if (!tmp_objdir) { - if (err_fd > 0) - close(err_fd); - return "unable to create temporary object directory"; - } - strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir)); - - /* - * Normally we just pass the tmp_objdir environment to the child - * processes that do the heavy lifting, but we may need to see these - * objects ourselves to set up shallow information. - */ - tmp_objdir_add_as_alternate(tmp_objdir); + odb_transaction_env(transaction, &child.env); if (ntohl(hdr.hdr_entries) < unpack_limit) { strvec_push(&child.args, "unpack-objects"); @@ -2430,13 +2427,14 @@ static const char *unpack(int err_fd, struct shallow_info *si) return NULL; } -static const char *unpack_with_sideband(struct shallow_info *si) +static const char *unpack_with_sideband(struct shallow_info *si, + struct odb_transaction *transaction) { struct async muxer; const char *ret; if (!use_sideband) - return unpack(0, si); + return unpack(0, si, transaction); use_keepalive = KEEPALIVE_AFTER_NUL; memset(&muxer, 0, sizeof(muxer)); @@ -2445,7 +2443,7 @@ static const char *unpack_with_sideband(struct shallow_info *si) if (start_async(&muxer)) return NULL; - ret = unpack(muxer.in, si); + ret = unpack(muxer.in, si, transaction); finish_async(&muxer); return ret; @@ -2622,6 +2620,7 @@ int cmd_receive_pack(int argc, struct oid_array ref = OID_ARRAY_INIT; struct shallow_info si; struct packet_reader reader; + struct odb_transaction *transaction = NULL; struct option options[] = { OPT__QUIET(&quiet, N_("quiet")), @@ -2706,11 +2705,14 @@ int cmd_receive_pack(int argc, if (!si.nr_ours && !si.nr_theirs) shallow_update = 0; if (!delete_only(commands)) { - unpack_status = unpack_with_sideband(&si); + if (odb_transaction_begin(the_repository->objects, &transaction, ODB_TRANSACTION_RECEIVE)) + unpack_status = "unable to start object transaction"; + else + unpack_status = unpack_with_sideband(&si, transaction); update_shallow_info(commands, &si, &ref); } use_keepalive = KEEPALIVE_ALWAYS; - execute_commands(commands, unpack_status, &si, + execute_commands(commands, unpack_status, &si, transaction, &push_options); delete_tempfile(&pack_lockfile); sigchain_push(SIGPIPE, SIG_IGN); @@ -2719,7 +2721,7 @@ int cmd_receive_pack(int argc, else if (report_status) report(commands, unpack_status); sigchain_pop(SIGPIPE); - run_receive_hook(commands, "post-receive", 1, + run_receive_hook(commands, "post-receive", 1, NULL, &push_options); run_update_post_hook(commands); free_commands(commands); -- 2.55.0.122.gf85a7e6620