Re: [PATCH 0/9] object-file: move writing of loose objects into "loose" source

SZEDER Gábor <[email protected]> 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.