diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-11 12:56:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 12:56:29 -0800 |
| commit | 6d37ca21651408b6d29b86a67d0179eb98629fd8 (patch) | |
| tree | 7c8fdc0b3fc36eafed68e1309bd23690726c6673 /sequencer.c | |
| parent | merge,rebase,revert: select ort or recursive by config or environment (diff) | |
| parent | shortlog: use strset from strmap.h (diff) | |
| download | tgif-6d37ca21651408b6d29b86a67d0179eb98629fd8.tar.xz | |
Merge branch 'en/strmap' into en/merge-ort-impl
* 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]()
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 6b6c15c357..e3ae0b2e42 100644 --- a/sequencer.c +++ b/sequencer.c @@ -5108,7 +5108,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, oidmap_free(&commit2todo, 1); oidmap_free(&state.commit2label, 1); - hashmap_free_entries(&state.labels, struct labels_entry, entry); + hashmap_clear_and_free(&state.labels, struct labels_entry, entry); strbuf_release(&state.buf); return 0; @@ -5627,7 +5627,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) for (i = 0; i < todo_list->nr; i++) free(subjects[i]); free(subjects); - hashmap_free_entries(&subject2item, struct subject2item_entry, entry); + hashmap_clear_and_free(&subject2item, struct subject2item_entry, entry); clear_commit_todo_item(&commit_todo); |