Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 7234d76f6e7c0ca59964ec06bf3ced7196716749..a357cb04fc26133ba3c4880de562b3f25e524fee 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1905,6 +1905,8 @@ static void show_object(struct object_array_entry *p)
        add_preferred_base_object(p->name);
        add_object_entry(p->item->sha1, p->item->type, p->name, 0);
        p->item->flags |= OBJECT_ADDED;
+       free((char *)p->name);
+       p->name = NULL;
 }
 
 static void show_edge(struct commit *commit)