@matheusbsbs / matheus-bagliano / commits / 630cd5194e
Fork 0

commit-graph.c: peel refs in 'add_ref_to_set'

While iterating references (to discover the set of commits to write to the commit-graph with 'git commit-graph write --reachable'), 'add_ref_to_set' can save 'fill_oids_from_commits()' some time by peeling the references beforehand. Move peeling out of 'fill_oids_from_commits()' and into 'add_ref_to_set()' to use 'peel_ref()' instead of 'deref_tag()'. Doing so allows the commit-graph machinery to use the peeled value from '$GIT_DIR/packed-refs' instead of having to load and parse tags. While we're at it, discard non-commit objects reachable from ref tips. This would be done automatically by 'fill_oids_from_commits()', but such functionality will be removed in a subsequent patch after the call to 'lookup_commit_reference_gently' is dropped (at which point a non-commit object in the commits oidset will become an error). Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed May 13, 2020 at 15:59 UTC 630cd5194e6fcf928290a5c0f85e4094559197c8
1 file changed +5 -1
commit-graph.c
+5 -1
@@ -1327,9 +1327,13 @@ static int add_ref_to_set(const char *refname,
1327 const struct object_id *oid,
1328 int flags, void *cb_data)
1329 {
1330 + struct object_id peeled;
1331 struct refs_cb_data *data = (struct refs_cb_data *)cb_data;
1332
1332 - oidset_insert(data->commits, oid);
1333 + if (!peel_ref(refname, &peeled))
1334 + oid = &peeled;
1335 + if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT)
1336 + oidset_insert(data->commits, oid);
1337
1338 display_progress(data->progress, oidset_size(data->commits));
1339