aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-05-19 16:02:47 -0700
committerJunio C Hamano <gitster@pobox.com>2025-05-19 16:02:47 -0700
commita9dcacbf2a74537916f61dd8c5f2dd2c1b4eb58a (patch)
tree1e9684531b97a24571f1f977137fe42b5bab69f7 /sequencer.c
parent9af978fa041d69d4281315630e659550a1d8104e (diff)
parent4b63963f5d729cb9eb997c8912b7d500ffc53297 (diff)
downloadgit-a9dcacbf2a74537916f61dd8c5f2dd2c1b4eb58a.tar.xz
Merge branch 'jk/oidmap-cleanup'
Code cleanup. * jk/oidmap-cleanup: raw_object_store: drop extra pointer to replace_map oidmap: add size function oidmap: rename oidmap_free() to oidmap_clear()
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c
index 4e77da475c..4edf66fb28 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -6051,8 +6051,8 @@ static int make_script_with_merges(struct pretty_print_context *pp,
oidset_clear(&interesting);
oidset_clear(&child_seen);
oidset_clear(&shown);
- oidmap_free(&commit2todo, 1);
- oidmap_free(&state.commit2label, 1);
+ oidmap_clear(&commit2todo, 1);
+ oidmap_clear(&state.commit2label, 1);
hashmap_clear_and_free(&state.labels, struct labels_entry, entry);
strbuf_release(&state.buf);