From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Patrick Steinhardt <ps@pks.im>,
git@vger.kernel.org, Justin Tobler <jltobler@gmail.com>
Subject: Re: [PATCH 0/9] object-file: move writing of loose objects into "loose" source
Date: Sat, 18 Jul 2026 18:04:52 -0700 [thread overview]
Message-ID: <xmqq5x2brdqj.fsf@gitster.g> (raw)
In-Reply-To: <alvWfOJb6vAsusai@szeder.dev> ("SZEDER Gábor"'s message of "Sat, 18 Jul 2026 21:39:40 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> Hi Junio,
> ...
>> Note that jt/receive-pack-use-odb-transaction requires an evil merge:
>>
>> diff --git a/odb/source-packed.c b/odb/source-packed.c
>> index 06b31dd743..cbb06da038 100644
>> --- a/odb/source-packed.c
>> +++ b/odb/source-packed.c
>> @@ -545,7 +545,8 @@ static int odb_source_packed_write_object_stream(struct odb_source *source UNUSE
>> }
>>
>> static int odb_source_packed_begin_transaction(struct odb_source *source UNUSED,
>> - struct odb_transaction **out UNUSED)
>> + struct odb_transaction **out UNUSED,
>> + enum odb_transaction_flags flags UNUSED)
>> {
>> return error("packed backend cannot begin transactions");
>> }
>
> It seems that you performed this evil merge when merging the topic
> jt/receive-pack-use-odb-transaction into jch as 9727bd8447 (Merge
> branch 'jt/receive-pack-use-odb-transactions' into jch, 2026-07-17),
> but forgot to do so when creating the base for this patch series as
> 1d64e64326 (Merge branch 'jt/receive-pack-use-odb-transactions' into
> ps/odb-move-loose-object-writing, 2026-07-17). Consequently, neither
> 1d64e64326 nor any of the the commits of this patch series can be
> built because of the mismatching function signature:
Thanks for noticing.
Very much appreciated.
Will fix-up.
next prev parent reply other threads:[~2026-07-19 1:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-17 9:32 [PATCH 0/9] object-file: move writing of loose objects into "loose" source Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 1/9] odb: compute compat object ID in `odb_write_object_ext()` Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 2/9] t/u-odb-inmemory: implement wrapper for writing objects Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 3/9] odb: compute object hash in `odb_write_object_ext()` Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 4/9] odb: lift object existence check out of the "loose" backend Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 5/9] odb: support setting mtime when writing objects Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 6/9] object-file: fix memory leak in `force_object_loose()` Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 7/9] object-file: force objects loose via generic interface Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 8/9] object-file: move `force_object_loose()` Patrick Steinhardt
2026-07-17 9:32 ` [PATCH 9/9] object-file: move logic to write loose objects Patrick Steinhardt
2026-07-18 19:39 ` [PATCH 0/9] object-file: move writing of loose objects into "loose" source SZEDER Gábor
2026-07-19 1:04 ` Junio C Hamano [this message]
2026-07-19 5:48 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5x2brdqj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jltobler@gmail.com \
--cc=ps@pks.im \
--cc=szeder.dev@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.