Merge branch 'en/strmap'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 221e98721d23b398c115b3ae743cdc889d81515f..8909a467700c506f7068ed566aa7813c093157fd 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -5085,7 +5085,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;
@@ -5601,7 +5601,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);