aboutsummaryrefslogtreecommitdiffstats
path: root/pseudo-merge.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-12-17 07:43:48 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-18 10:44:30 -0800
commit1f7e6478dcd9e7462c70a5784ae0d41ab25ced11 (patch)
tree6f7b4bbb3bcd69ff179a66a52c0fde2d2404f00d /pseudo-merge.c
parentMerge branch 'ps/build-sign-compare' into ps/the-repository (diff)
downloadgit-1f7e6478dcd9e7462c70a5784ae0d41ab25ced11.tar.gz
git-1f7e6478dcd9e7462c70a5784ae0d41ab25ced11.zip
progress: stop using `the_repository`
Stop using `the_repository` in the "progress" subsystem by passing in a repository when initializing `struct progress`. Furthermore, store a pointer to the repository in that struct so that we can pass it to the trace2 API when logging information. Adjust callers accordingly by using `the_repository`. While there may be some callers that have a repository available in their context, this trivial conversion allows for easier verification and bubbles up the use of `the_repository` by one level. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pseudo-merge.c')
-rw-r--r--pseudo-merge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pseudo-merge.c b/pseudo-merge.c
index 971f54cfe1..893b763fe4 100644
--- a/pseudo-merge.c
+++ b/pseudo-merge.c
@@ -459,7 +459,8 @@ void select_pseudo_merges(struct bitmap_writer *writer)
return;
if (writer->show_progress)
- progress = start_progress("Selecting pseudo-merge commits",
+ progress = start_progress(the_repository,
+ "Selecting pseudo-merge commits",
writer->pseudo_merge_groups.nr);
refs_for_each_ref(get_main_ref_store(the_repository),