diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-26 20:32:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-26 20:32:22 +0200 |
| commit | 2ff26d228600848ecf3d44b3796beee310ebcccf (patch) | |
| tree | 1753564cddbf3968d05dec56308fd82e9ee47213 /pseudo-merge.c | |
| parent | Merge branch 'tb/pseudo-merge-bitmap-fixes' (diff) | |
| parent | diff-lib: drop unused index argument from get_stat_data() (diff) | |
| download | git-2ff26d228600848ecf3d44b3796beee310ebcccf.tar.xz git-2ff26d228600848ecf3d44b3796beee310ebcccf.zip | |
Merge branch 'jk/drop-unused-parameters'
Drop unused parameters from functions.
* jk/drop-unused-parameters:
diff-lib: drop unused index argument from get_stat_data()
ref-filter: drop unused parameters from email_atom_option_parser()
pack-bitmap: drop unused parameters from select_pseudo_merges()
pack-bitmap: load writer config from repository parameter
refs: drop some unused parameters from create_symref_lock()
Diffstat (limited to 'pseudo-merge.c')
| -rw-r--r-- | pseudo-merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pseudo-merge.c b/pseudo-merge.c index 0c11b0ab3d..10ebd9a4e9 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; @@ -429,8 +430,7 @@ static void sort_pseudo_merge_matches(struct pseudo_merge_matches *matches) QSORT(matches->unstable, matches->unstable_nr, commit_date_cmp); } -void select_pseudo_merges(struct bitmap_writer *writer, - struct commit **commits, size_t commits_nr) +void select_pseudo_merges(struct bitmap_writer *writer) { struct progress *progress = NULL; uint32_t i; |