Merge branch 'en/strmap'
A specialization of hashmap that uses a string as key has been introduced. Hopefully it will see wider use over time. * en/strmap: shortlog: use strset from strmap.h Use new HASHMAP_INIT macro to simplify hashmap initialization strmap: take advantage of FLEXPTR_ALLOC_STR when relevant strmap: enable allocations to come from a mem_pool strmap: add a strset sub-type strmap: split create_entry() out of strmap_put() strmap: add functions facilitating use as a string->int map strmap: enable faster clearing and reusing of strmaps strmap: add more utility functions strmap: new utility functions hashmap: provide deallocation function names hashmap: introduce a new hashmap_partial_clear() hashmap: allow re-use after hashmap_free() hashmap: adjust spacing to fix argument alignment hashmap: add usage documentation explaining hashmap_free[_entries]()
This commit is contained in:
@ -2230,7 +2230,7 @@ void ref_array_clear(struct ref_array *array)
|
||||
used_atom_cnt = 0;
|
||||
|
||||
if (ref_to_worktree_map.worktrees) {
|
||||
hashmap_free_entries(&(ref_to_worktree_map.map),
|
||||
hashmap_clear_and_free(&(ref_to_worktree_map.map),
|
||||
struct ref_to_worktree_entry, ent);
|
||||
free_worktrees(ref_to_worktree_map.worktrees);
|
||||
ref_to_worktree_map.worktrees = NULL;
|
||||
|
||||
Reference in New Issue
Block a user