diff options
| -rw-r--r-- | pack-bitmap-write.c | 2 | ||||
| -rw-r--r-- | pseudo-merge.c | 5 | ||||
| -rw-r--r-- | pseudo-merge.h | 3 |
3 files changed, 6 insertions, 4 deletions
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 @@ 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 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 |