{"thread":{"id":"66707","subject":"[Outreachy PATCH] pseudo-merge: use writer->repo instead of the_repository","startedAt":"2026-10-29T19:41:16Z","lastAt":"2026-10-29T19:41:16Z","messageCount":1,"participants":["Okhuomon Ajayi"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"556819","messageId":"20261029194116.63464-1-okhuomonajayi54@gmail.com","threadId":"66707","inReplyTo":null,"subject":"[Outreachy PATCH] pseudo-merge: use writer->repo instead of the_repository","fromName":"Okhuomon Ajayi","fromEmail":"okhuomonajayi54@gmail.com","sentAt":"2026-10-29T19:41:16Z","receivedAt":"2026-10-29T19:41:16Z","isPatch":true,"sender":{"key":"okhuomonajayi54@gmail.com","avatar":null},"body":"The functions in pseudo-merge.c receive a bitmap_writer whose repo\nfield names the repository the bitmap is written for, yet they\nlook up commits, peel refs, show progress and walk refs in\nthe_repository. push_pseudo_merge() also allocates its commits in\nthe_repository. If the writer was set up for another repository,\nthese functions would still read from the global one.\n\nUse writer->repo instead. push_pseudo_merge() does not have the\nwriter, so add a repository parameter to it and let its callers in\nselect_pseudo_merges_1() pass writer->repo.\n\nDrop USE_THE_REPOSITORY_VARIABLE, as pseudo-merge.c no longer uses\nthe_repository.\n\nSigned-off-by: Okhuomon Ajayi <okhuomonajayi54@gmail.com>\n---\n pseudo-merge.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/pseudo-merge.c b/pseudo-merge.c\nindex 22b8600d68..368c56efc2 100644\n--- a/pseudo-merge.c\n+++ b/pseudo-merge.c\n@@ -1,4 +1,3 @@\n-#define USE_THE_REPOSITORY_VARIABLE\n #define DISABLE_SIGN_COMPARE_WARNINGS\n \n #include \"git-compat-util.h\"\n@@ -233,13 +232,13 @@ static int find_pseudo_merge_group_for_ref(const struct reference *ref, void *_d\n \tuint32_t i;\n \tint has_bitmap;\n \n-\tif (!reference_get_peeled_oid(the_repository, ref, &peeled))\n+\tif (!reference_get_peeled_oid(writer->repo, ref, &peeled))\n \t\tmaybe_peeled = &peeled;\n \n-\tc = lookup_commit(the_repository, maybe_peeled);\n+\tc = lookup_commit(writer->repo, maybe_peeled);\n \tif (!c)\n \t\treturn 0;\n-\tif (repo_parse_commit(the_repository, c))\n+\tif (repo_parse_commit(writer->repo, c))\n \t\treturn 0;\n \tif (!packlist_find(writer->to_pack, maybe_peeled))\n \t\treturn 0;\n@@ -298,13 +297,14 @@ static int find_pseudo_merge_group_for_ref(const struct reference *ref, void *_d\n \treturn 0;\n }\n \n-static struct commit *push_pseudo_merge(struct pseudo_merge_group *group)\n+static struct commit *push_pseudo_merge(struct repository *r,\n+\t\t\t\t\tstruct pseudo_merge_group *group)\n {\n \tstruct commit *merge;\n \n \tALLOC_GROW(group->merges, group->merges_nr + 1, group->merges_alloc);\n \n-\tmerge = alloc_commit_node(the_repository);\n+\tmerge = alloc_commit_node(r);\n \tmerge->object.parsed = 1;\n \tmerge->object.flags |= BITMAP_PSEUDO_MERGE;\n \n@@ -353,7 +353,7 @@ static void select_pseudo_merges_1(struct bitmap_writer *writer,\n \t\tstruct commit *merge;\n \t\tstruct commit_list **p;\n \n-\t\tmerge = push_pseudo_merge(group);\n+\t\tmerge = push_pseudo_merge(writer->repo, group);\n \t\tp = &merge->parents;\n \n \t\t/*\n@@ -395,7 +395,7 @@ static void select_pseudo_merges_1(struct bitmap_writer *writer,\n \t\tstruct commit_list **p;\n \t\tuint32_t size, end;\n \n-\t\tmerge = push_pseudo_merge(group);\n+\t\tmerge = push_pseudo_merge(writer->repo, group);\n \t\tp = &merge->parents;\n \n \t\tsize = pseudo_merge_group_size(group, matches, i);\n@@ -461,11 +461,11 @@ void select_pseudo_merges(struct bitmap_writer *writer)\n \t\treturn;\n \n \tif (writer->show_progress)\n-\t\tprogress = start_progress(the_repository,\n+\t\tprogress = start_progress(writer->repo,\n \t\t\t\t\t  \"Selecting pseudo-merge commits\",\n \t\t\t\t\t  writer->pseudo_merge_groups.nr);\n \n-\trefs_for_each_ref(get_main_ref_store(the_repository),\n+\trefs_for_each_ref(get_main_ref_store(writer->repo),\n \t\t\t  find_pseudo_merge_group_for_ref, writer);\n \n \tfor (i = 0; i < writer->pseudo_merge_groups.nr; i++) {\n\nbase-commit: 8d1b215c01512b9658d4525c54ff9b9245f9a7e8\n-- \n2.56.0\n\n\n"}]}