unpack_trees_options: free messages when done

diff --git a/merge.c b/merge.c
index f123658e582fc1f142b25bb8c71b5dcbe84fe3aa..b433291d0c376ea3ba0a1c56b465cc1b91da4ddf 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -130,8 +130,11 @@ int checkout_fast_forward(const struct object_id *head,
 
        if (unpack_trees(nr_trees, t, &opts)) {
                rollback_lock_file(&lock_file);
+               clear_unpack_trees_porcelain(&opts);
                return -1;
        }
+       clear_unpack_trees_porcelain(&opts);
+
        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
                return error(_("unable to write new index file"));
        return 0;