Re: [RFC PATCH v7 10/10] diff: consult oid-only hunk providers via diff.<driver>.process

Junio C Hamano <[email protected]>
Newsgroups org.kernel.vger.git
Message-ID <[email protected]>
Michael Montalbo <[email protected]> writes:

> +static long blob_line_cap(struct repository *r, const struct object_id *oid)
> +{
> +	unsigned long size;
> +	struct object_info oi = OBJECT_INFO_INIT;
> +
> +	oi.sizep = &size;

This breaks the build on platforms whose ulong is narrower than
size_t since June 21 due to c6a4629e32 (odb: use size_t for
object_info.sizep and the size APIs, 2026-06-15), which changed the
type of the '.sizep' member of 'struct object_info' from 'ulong' to
'size_t'.

Tentatively, I'll pile this on top of your series before rebuilding
'seen'; I do not know if there are further fallouts, though.

diff --git a/diff-process.c b/diff-process.c
index 121903a6c8..d28f9cf973 100644
--- a/diff-process.c
+++ b/diff-process.c
@@ -325,7 +325,7 @@ static int validate_external_hunks(const struct xdl_hunk *hunks, size_t nr,
  */
 static long blob_line_cap(struct repository *r, const struct object_id *oid)
 {
-	unsigned long size;
+	size_t size;
 	struct object_info oi = OBJECT_INFO_INIT;
 
 	oi.sizep = &size;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.