mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 03:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

pack-bitmap: load writer config from repository parameter

Browse Source 
In bitmap_writer_init(), we take a repository parameter but ever look at
it. Most of the initialization here is independent of the repository,
but we do load some config. So let's pass the repo we get down to
load_pseudo_merges_from_config(), which in turn can use repo_config(),
rather than depending on the_repository via git_config().

The outcome is the same, since all callers pass in the_repository
anyway. But it takes us a step closer to getting rid of the global, and
as a bonus it silences an unused parameter warning.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2024-08-17 03:26:53 -04:00 committed by Junio C Hamano
parent 65e7a4478c
commit ecc6fa9ae9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pack-bitmap-write.c
View File

@ -51,7 +51,7 @@ void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r)
string_list_init_dup(&writer->pseudo_merge_groups);
load_pseudo_merges_from_config(&writer->pseudo_merge_groups);
load_pseudo_merges_from_config(r, &writer->pseudo_merge_groups);
}
static void free_pseudo_merge_commit_idx(struct pseudo_merge_commit_idx *idx)

5
pseudo-merge.c
View File

@ -183,11 +183,12 @@ done:
return ret;
}
void load_pseudo_merges_from_config(struct string_list *list)
void load_pseudo_merges_from_config(struct repository *r,
struct string_list *list)
{
struct string_list_item *item;
git_config(pseudo_merge_config, list);
repo_config(r, pseudo_merge_config, list);
for_each_string_list_item(item, list) {
struct pseudo_merge_group *group = item->util;

3
pseudo-merge.h
View File

@ -10,6 +10,7 @@ struct commit;
struct string_list;
struct bitmap_index;
struct bitmap_writer;
struct repository;
/*
* A pseudo-merge group tracks the set of non-bitmapped reference tips
@ -72,7 +73,7 @@ struct pseudo_merge_matches {
* entry keys are the pseudo-merge group names, and the values are
* pointers to the pseudo_merge_group structure itself.
*/
void load_pseudo_merges_from_config(struct string_list *list);
void load_pseudo_merges_from_config(struct repository *r, struct string_list *list);
/*
* A pseudo-merge commit index (pseudo_merge_commit_idx) maps a