All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 01/12] commit-graph: simplify linking commit graph chains
Date: Fri, 20 Nov 2026 12:15:37 +0100	[thread overview]
Message-ID: <awArrFeY_B98IGoI@pks.im> (raw)
In-Reply-To: <xmqqqzgkjy57.fsf@gitster.g>

On Mon, Nov 16, 2026 at 12:53:56PM -0800, Junio C Hamano wrote:
> Patrick Steinhardt <ps@pks.im> writes:
> > diff --git a/commit-graph.c b/commit-graph.c
> > index da65cd3deb9..94c761907a0 100644
> > --- a/commit-graph.c
> > +++ b/commit-graph.c
[snip]
> >  	if (n && !g->chunk_base_graphs) {
> >  		warning(_("commit-graph has no base graphs chunk"));
> > -		return 0;
> > +		return -1;
> >  	}
> 
> It might be obvious when reading (and writing) this patch, but it is
> a welcome change to standardize on "0 means happy" convention.
> Should the fact that we now use more common error reporting
> convention be mentioned in the log message?

Yeah, that's a good idea.

> >  	if (g->chunk_base_graphs_size / g->hash_algo->rawsz < n) {
> >  		warning(_("commit-graph base graphs chunk is too small"));
> > -		return 0;
> > +		return -1;
> >  	}
> >  
> > -	while (n) {
> > +	for (layer = base; layer; layer = layer->base_graph) {
> >  		n--;
> > -
> > -		if (!cur_g ||
> > -		    !oideq(&oids[n], &cur_g->oid) ||
> > -		    !hasheq(oids[n].hash, g->chunk_base_graphs + st_mult(g->hash_algo->rawsz, n),
> > +		if (!hasheq(layer->oid.hash,
> > +			    g->chunk_base_graphs + st_mult(g->hash_algo->rawsz, n),
> >  			    g->hash_algo)) {
> 
> We no longer check cur_g->oid is what we expect, because we lost the
> array that holds the value to compare.  Would this make cur_g->oid a
> write-only member that is only computed and written but never used
> other than reporting purposes?  In commit-graph.c before this step,
> I think this is the only place that reads ->oid for purposes other
> than passing it to diagnostics like die/warn.
> 
> We seem to still be making sure in load_commit_graph_chain_fd_st()
> that the line we read into local oid there is a hash, so perhaps it
> is possible to validate g->oid against this oid after we load g?

Yeah. The thing is that this whole is somewhat flawed in the first
place. It seems like this check is designed to verify whether each
respective layer that we load matches the expected object ID in the
chain file. But that's actually not the case: we don't verify the base
layer, and we don't verify the topmost layer, either.

So the obvious fix woudl be the following:

diff --git a/commit-graph.c b/commit-graph.c
index 94c761907a0..47a97c9fbc0 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -679,7 +679,10 @@ struct commit_graph *load_commit_graph_chain_fd_st(struct object_database *odb,
 			free(graph_name);
 
 			if (g) {
-				if (!commit_graph_link_base(g, graph_chain)) {
+				if (oidcmp(&oid, &g->oid)) {
+					warning(_("commit-graph chain does not match"));
+					commit_graph_free(g);
+				} else if (!commit_graph_link_base(g, graph_chain)) {
 					graph_chain = g;
 					valid = 1;
 				} else {

But in fact, that is a stricter check than before, because we now verify
that every single layer's trailer hash matches what we have in our chain
file.

From my persective that's an improvement, as it improves the validation
and also makes the code more obvious. But it does cause a test failure
because we implicitly rely on the base layer not having been verified in
t5324.

I'm inclined to add another preparatory commit to this patch series that
fixes this issue. Which makes me wonder whether I should further split
this patch series in two, as it has grown quite long by now and is thus
quite involved to review.

Patrick

  reply	other threads:[~2026-11-20 11:15 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 13:07 [PATCH 00/12] Introduce pluggable commit graphs Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 01/12] commit-graph: simplify linking commit graph chains Patrick Steinhardt
2026-11-16 20:53   ` Junio C Hamano
2026-11-20 11:15     ` Patrick Steinhardt [this message]
2026-11-16 13:07 ` [PATCH 02/12] commit-graph: simplify reading a single commit graph Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 03/12] commit-graph: expose function to validate a commit graph chain Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 04/12] commit-graph: decide mergeable and chainable layers by depth Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 05/12] commit-graph: introduce common exit for `write_commit_graph_file()` Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 06/12] commit-graph: derive layer infos from the passed-in chain Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 07/12] commit-graph: split out check whether writing commit graphs is allowed Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 08/12] commit-graph: split out logic to write a new commit graph layer Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 09/12] commit-graph: mark incomplete commit graph chains Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 10/12] odb/source: make commit graphs pluggable Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 11/12] odb/source-files: move logic to derive commit graph paths Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 12/12] odb/source-files: internalize " Patrick Steinhardt
2026-11-20 12:22 ` [PATCH v2 0/7] Introduce pluggable commit graphs (pt.1) Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 1/7] commit-graph: verify all trailer hashes against the chain file Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 2/7] commit-graph: simplify linking commit graph chains Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 3/7] commit-graph: simplify reading a single commit graph Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 4/7] commit-graph: expose function to validate a commit graph chain Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 5/7] commit-graph: decide mergeable and chainable layers by depth Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 6/7] commit-graph: introduce common exit for `write_commit_graph_file()` Patrick Steinhardt
2026-11-20 12:22   ` [PATCH v2 7/7] commit-graph: derive layer infos from the passed-in chain Patrick Steinhardt

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=awArrFeY_B98IGoI@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.