diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:01:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:01:25 -0700 |
| commit | a54c4edc511608fdba513cc94812c31fd4b497f6 (patch) | |
| tree | 53dea1be73208c23be4cdf2aec37894de8415889 /builtin-pack-objects.c | |
| parent | ee7ec2f9ded03700f2b95cc1d4b3d60ed374132a (diff) | |
| parent | 3bd1bb327eb4d3e386800897734f9f42b48280ff (diff) | |
| download | git-a54c4edc511608fdba513cc94812c31fd4b497f6.tar.gz | |
Merge branch 'maint'
* maint:
GIT 1.6.2.3
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls
Conflicts:
GIT-VERSION-GEN
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 99181fd7ee..e58d300e3f 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1912,6 +1912,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) |