diff mbox series

[2/5] pack-bitmap: load writer config from repository parameter

Message ID 20240817072653.GB1535915@coredump.intra.peff.net (mailing list archive)
State Accepted
Commit ecc6fa9ae964daf333f5e64cdff6f5232139f440
Headers show
Series dropping some more unused parameters | expand

Commit Message

Jeff King Aug. 17, 2024, 7:26 a.m. UTC 
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>
---
 pack-bitmap-write.c | 2 +-
 pseudo-merge.c      | 5 +++--
 pseudo-merge.h      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

Comments

Eric Sunshine Aug. 17, 2024, 7:33 a.m. UTC | #1 
On Sat, Aug 17, 2024 at 3:27 AM Jeff King <peff@peff.net> wrote:
> In bitmap_writer_init(), we take a repository parameter but ever look at

s/ever/never/

> 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>
diff mbox series

Patch

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index bf96c80898..7787600234 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -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)
diff --git a/pseudo-merge.c b/pseudo-merge.c
index 77a83b9c5c..1d7f5381a4 100644
--- a/pseudo-merge.c
+++ b/pseudo-merge.c
@@ -183,11 +183,12 @@  static int pseudo_merge_config(const char *var, const char *value,
 	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;
diff --git a/pseudo-merge.h b/pseudo-merge.h
index 2aca01d056..3aecba772b 100644
--- a/pseudo-merge.h
+++ b/pseudo-merge.h
@@ -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