Merge branch 'en/merge-options-ff-and-friends'

diff --git a/commit.c b/commit.c
index a98de16e3d570e09696a844b018bd4d580d9a30e..3fe5f8fa9c6e95e966bbebca3159e24595e1ee48 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -364,8 +364,8 @@ struct object_id *get_commit_tree_oid(const struct commit *commit)
 void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
 {
        set_commit_tree(c, NULL);
-       c->index = 0;
        free_commit_buffer(pool, c);
+       c->index = 0;
        free_commit_list(c->parents);
 
        c->object.parsed = 0;