tree-walk.c: remove the_repo from get_tree_entry()

diff --git a/builtin/repack.c b/builtin/repack.c
index 2a1c7b21c5d9cb52c328105b470366d1c7ef7c76..caca11392713eb92816d1e503f286bfe0d9be78a 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -14,7 +14,7 @@
 
 static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
-static int write_bitmaps;
+static int write_bitmaps = -1;
 static int use_delta_islands;
 static char *packdir, *packtmp;
 
@@ -343,6 +343,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
            (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
                die(_("--keep-unreachable and -A are incompatible"));
 
+       if (write_bitmaps < 0)
+               write_bitmaps = (pack_everything & ALL_INTO_ONE) &&
+                                is_bare_repository();
        if (pack_kept_objects < 0)
                pack_kept_objects = write_bitmaps;
 
@@ -419,6 +422,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
        if (!names.nr && !po_args.quiet)
                printf_ln(_("Nothing new to pack."));
 
+       close_all_packs(the_repository->objects);
+
        /*
         * Ok we have prepared all new packfiles.
         * First see if there are packs of the same name and if so