diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 15:20:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 15:20:29 -0700 |
commit | bc69776aa12c68958e381e8c24e8faa172dde2d8 (patch) | |
tree | a9775aa79f0285ea565a7ff035e1ca54dbc56447 /builtin-pack-objects.c | |
parent | f7af75777fd5a217d43acb2098cf043a73c20b01 (diff) | |
parent | c6d8f7635f619f6576dccf17c1f1264d2cc37a2a (diff) | |
download | git-bc69776aa12c68958e381e8c24e8faa172dde2d8.tar.gz |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r-- | builtin-pack-objects.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 7234d76f6e..a357cb04fc 100644 --- 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) |