git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] object-file: avoid ODB transaction when not writing objects

From
Jeff King <peff@peff.net>
Date
Apr 7, 2026, 21:29 UTC
Message-ID
<20260407212930.GA1315247@coredump.intra.peff.net>
In-Reply-To
<xmqqo6ju31wx.fsf@gitster.g>
On Tue, Apr 07, 2026 at 02:18:06PM -0700, Junio C Hamano wrote:
Show 28 quoted lines
> From: Justin Tobler <jltobler@gmail.com>
> Date: Tue, 7 Apr 2026 15:17:30 -0500
> Subject: [PATCH] object-file: avoid ODB transaction when not writing objects
> [...]
> +static int hash_blob_stream(const struct git_hash_algo *hash_algo,
> +			    struct object_id *result_oid, int fd, size_t size)
> +{
> +	unsigned char buf[16384];
> +	struct git_hash_ctx ctx;
> +	unsigned header_len;
> +
> +	header_len = format_object_header((char *)buf, sizeof(buf),
> +					  OBJ_BLOB, size);
> +	hash_algo->init_fn(&ctx);
> +	git_hash_update(&ctx, buf, header_len);
> +
> +	while (size) {
> +		size_t rsize = size < sizeof(buf) ? size : sizeof(buf);
> +		ssize_t read_result = read_in_full(fd, buf, rsize);
> +
> +		if ((read_result < 0) || ((size_t)read_result != rsize))
> +			return -1;
> +
> +		git_hash_update(&ctx, buf, rsize);
> +		size -= read_result;
> +	}
> +
> +	git_hash_final_oid(result_oid, &ctx);

This looks correct to me. In the back of my mind I felt like we might already have a function to check a streaming hash, but I was just thinking of how parse_object() streams blobs for its hash-check. And that is always coming from the object database, whereas here we are taking data from elsewhere. So we do need this new function.

I probably would have used fewer parentheses in the conditional, but that may be personal preference. ;)

Show 15 quoted lines
> diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
> index c824c1a25c..c1dbc6359a 100755
> --- a/t/t1517-outside-repo.sh
> +++ b/t/t1517-outside-repo.sh
> @@ -93,6 +93,14 @@ test_expect_success 'diff outside repository' '
>  	test_cmp expect actual
>  '
>  
> +test_expect_success 'diff files exceeding bigFileThreshold outside repository' '
> +	cd non-repo &&
> +	echo foo >foo &&
> +	echo bar >bar &&
> +	test_must_fail git -c core.bigFileThreshold=1 diff -- foo bar >actual &&
> +	test_grep "diff --git a/foo b/bar" actual
> +'

This does a "cd" outside of a sub-shell, which affects all of the subsequent tests.

We also are already using the "nongit" wrapper in this script, so it could be used here.

Thought it was found originally with diff, the bug can also be demonstrated with just hash-object, which does make the test a little simpler.

The second and third are more style/taste questions, but I think the first is a blocker.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 10 in “object-file: avoid ODB transaction when not writing objects”
  1. object-file: avoid ODB transaction when not writing objectsJustin Tobler, Apr 7, 2026
  2. Junio C HamanoApr 7, 2026
  3. Jeff KingApr 7, 2026
  4. Junio C HamanoApr 7, 2026
  5. Justin ToblerApr 7, 2026
  6. Junio C HamanoApr 7, 2026
  7. Justin ToblerApr 7, 2026
  8. Junio C HamanoApr 7, 2026
  9. Justin ToblerApr 7, 2026
  10. Junio C HamanoApr 8, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.