[PATCH] Add the merge test Linus called "test script from hell".

diff --git a/read-tree.c b/read-tree.c
index f8dc509a1f999fcbcccc6936477ddc80c9d063cc..f6298e5c2178ee8e5f898ea769ae7108d1a7cfbd 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -11,11 +11,14 @@ static int unpack_tree(unsigned char *sha1)
 {
        void *buffer;
        unsigned long size;
+       int ret;
 
        buffer = read_object_with_reference(sha1, "tree", &size, 0);
        if (!buffer)
                return -1;
-       return read_tree(buffer, size, stage);
+       ret = read_tree(buffer, size, stage);
+       free(buffer);
+       return ret;
 }
 
 static char *lockfile_name;