diff options
author | Christian Couder <christian.couder@gmail.com> | 2024-02-14 15:25:11 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-14 09:39:14 -0800 |
commit | eaf07b7d15e067305d33150eb98bf0351f9f4cbd (patch) | |
tree | eb4ec48ac99f448027dbb95733a785140deb231e /list-objects-filter.c | |
parent | 3ff56af99b1c9becd9e603b59986359f553e62a8 (diff) | |
download | git-eaf07b7d15e067305d33150eb98bf0351f9f4cbd.tar.gz |
oidset: refactor oidset_insert_from_set()
In a following commit, we will need to add all the oids from a set into
another set. In "list-objects-filter.c", there is already a static
function called add_all() to do that.
Let's rename this function oidset_insert_from_set() and move it into
oidset.{c,h} to make it generally available.
While at it, let's remove a useless `!= NULL`.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'list-objects-filter.c')
-rw-r--r-- | list-objects-filter.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/list-objects-filter.c b/list-objects-filter.c index da287cc8e0..4346f8da45 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -711,15 +711,6 @@ static void filter_combine__free(void *filter_data) free(d); } -static void add_all(struct oidset *dest, struct oidset *src) { - struct oidset_iter iter; - struct object_id *src_oid; - - oidset_iter_init(src, &iter); - while ((src_oid = oidset_iter_next(&iter)) != NULL) - oidset_insert(dest, src_oid); -} - static void filter_combine__finalize_omits( struct oidset *omits, void *filter_data) @@ -728,7 +719,7 @@ static void filter_combine__finalize_omits( size_t sub; for (sub = 0; sub < d->nr; sub++) { - add_all(omits, &d->sub[sub].omits); + oidset_insert_from_set(omits, &d->sub[sub].omits); oidset_clear(&d->sub[sub].omits); } } |