Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction

[thirdparty/git.git] / refs / reftable-backend.c

diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
index e206d5a073ced9c24d9020f03a674ca207abdd06..0bed6d2ab4844a1eb6b548c77577f3fc13105a81 100644 (file)
--- a/refs/reftable-backend.c
+++ b/refs/reftable-backend.c
@@ -1203,9 +1203,16 @@ static int reftable_be_pack_refs(struct ref_store *ref_store,
        if (!stack)
                stack = refs->main_stack;
 
-       ret = reftable_stack_compact_all(stack, NULL);
-       if (ret)
+       if (opts->flags & PACK_REFS_AUTO)
+               ret = reftable_stack_auto_compact(stack);
+       else
+               ret = reftable_stack_compact_all(stack, NULL);
+       if (ret < 0) {
+               ret = error(_("unable to compact stack: %s"),
+                           reftable_error_str(ret));
                goto out;
+       }
+
        ret = reftable_stack_clean(stack);
        if (ret)
                goto out;