]> git.ipfire.org Git - thirdparty/git.git/commitdiff
reftable/stack: do not auto-compact twice in `reftable_stack_add()`
authorPatrick Steinhardt <ps@pks.im>
Wed, 3 Jan 2024 06:22:17 +0000 (07:22 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jan 2024 17:54:20 +0000 (09:54 -0800)
In 5c086453ff (reftable/stack: perform auto-compaction with
transactional interface, 2023-12-11), we fixed a bug where the
transactional interface to add changes to a reftable stack did not
perform auto-compaction by calling `reftable_stack_auto_compact()` in
`reftable_stack_addition_commit()`. While correct, this change may now
cause us to perform auto-compaction twice in the non-transactional
interface `reftable_stack_add()`:

  - It performs auto-compaction by itself.

  - It now transitively performs auto-compaction via the transactional
    interface.

Remove the first instance so that we only end up doing auto-compaction
once.

Reported-by: Han-Wen Nienhuys <hanwenn@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
reftable/stack.c

index 8729508dc35a85a5f49aa256974100d4fc2d980b..7ffeb3ee1074bc59aa094fabbbce24d1f3cfaf9a 100644 (file)
@@ -425,9 +425,6 @@ int reftable_stack_add(struct reftable_stack *st,
                return err;
        }
 
-       if (!st->disable_auto_compact)
-               return reftable_stack_auto_compact(st);
-
        return 0;
 }