pack-bitmap: load writer config from repository parameter

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>

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index bf96c808981c0aaf962d500ef06f0e6c6c42e90f..77876002347cc7e7cc6e39851b91aef7bf14d96a 100644 (file)
--- 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 77a83b9c5ce1814d5c2236d1aaf602176c242f97..1d7f5381a46360e0a3c647429b534f418c3e8756 100644 (file)
--- a/pseudo-merge.c
+++ b/pseudo-merge.c
@@ -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;

diff --git a/pseudo-merge.h b/pseudo-merge.h
index 2aca01d056666e4341a773888f843616751d475e..3aecba772b1ceb33d3321aa4a5e5cb68e648e813 100644 (file)
--- 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