diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-05-04 02:02:40 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-05-04 02:02:40 +0400 |
commit | 7d71be242d7fc8bd2eaef90e1848d71609c5c577 (patch) | |
tree | 7d3da3c0fafed46aebf41506d5e1136d2c2c387c /builtin-pack-objects.c | |
parent | a2dc04ba159def766ee17db00c60bdbda477955d (diff) | |
parent | cf2ab916afa4231f7e9db31796e7c0f712ff6ad1 (diff) |
Merge branch 'lt/pack-object-memuse' into maint
* lt/pack-object-memuse:
show_object(): push path_name() call further down
process_{tree,blob}: show objects without buffering
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r-- | builtin-pack-objects.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 6cf5b86e15..b859cb147c 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1907,13 +1907,19 @@ static void show_commit(struct commit *commit) commit->object.flags |= OBJECT_ADDED; } -static void show_object(struct object_array_entry *p) +static void show_object(struct object *obj, const struct name_path *path, const char *last) { - 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; + char *name = path_name(path, last); + + add_preferred_base_object(name); + add_object_entry(obj->sha1, obj->type, name, 0); + obj->flags |= OBJECT_ADDED; + + /* + * We will have generated the hash from the name, + * but not saved a pointer to it - we can free it + */ + free((char *)name); } static void show_edge(struct commit *commit) |