diff options
author | Taylor Blau <me@ttaylorr.com> | 2020-05-13 15:59:37 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 15:20:45 -0700 |
commit | 630cd5194e6fcf928290a5c0f85e4094559197c8 (patch) | |
tree | 9344b75020c90a3b49f51d1c859f7e3170e2d656 /commit-graph.c | |
parent | commit-graph.c: show progress of finding reachable commits (diff) | |
download | tgif-630cd5194e6fcf928290a5c0f85e4094559197c8.tar.xz |
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>
Diffstat (limited to 'commit-graph.c')
-rw-r--r-- | commit-graph.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index bd421c4f06..6098ecd575 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1327,9 +1327,13 @@ static int add_ref_to_set(const char *refname, const struct object_id *oid, int flags, void *cb_data) { + struct object_id peeled; struct refs_cb_data *data = (struct refs_cb_data *)cb_data; - oidset_insert(data->commits, oid); + if (!peel_ref(refname, &peeled)) + oid = &peeled; + if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT) + oidset_insert(data->commits, oid); display_progress(data->progress, oidset_size(data->commits)); |