Third batch

diff --git a/builtin/am.c b/builtin/am.c
index 78389d08b631f0281b7f315de0fb67f61c044d0f..1aea657a7f0b56345e1b2d5f8f32df439e278e80 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1801,7 +1801,7 @@ static void am_run(struct am_state *state, int resume)
         */
        if (!state->rebasing) {
                am_destroy(state);
-               close_all_packs(the_repository->objects);
+               close_object_store(the_repository->objects);
                run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
        }
 }
@@ -1956,7 +1956,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem
        if (merge_tree(remote_tree))
                return -1;
 
-       remove_branch_state(the_repository);
+       remove_branch_state(the_repository, 0);
 
        return 0;
 }