diff options
author | Elijah Newren <newren@gmail.com> | 2020-12-16 22:28:01 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-16 21:56:39 -0800 |
commit | 43e9c4eeccc069dbe6ca8a65dc5d0093b46acc03 (patch) | |
tree | 6bc2f73f50f8858d2db01a3f49834a21e5e3914f /rebase.h | |
parent | merge-ort: copy a few small helper functions from merge-recursive.c (diff) | |
download | tgif-43e9c4eeccc069dbe6ca8a65dc5d0093b46acc03.tar.xz |
merge-ort: make clear_internal_opts() aware of partial clearing
In order to handle recursive merges, after merging merge-bases we need
to clear away most of the data we had built up but some of it needs to
be kept -- in particular the "output" field. Rename the function to
reflect its future change in use.
Further, since "reinitialize" means we'll be reusing the fields
immediately, take advantage of this to only partially clear maps,
leaving the hashtable allocated and pre-sized. (This may be slightly
out-of-order since the speedups aren't realized until there are far
more strmaps in use, but the patch submission process already went out
of order because of various questions and requests for strmap. Anyway,
see commit 6ccdfc2a20 ("strmap: enable faster clearing and reusing of
strmaps", 2020-11-05), for performance details about the use of
strmap_partial_clear().)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase.h')
0 files changed, 0 insertions, 0 deletions