summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-12 15:34:53 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-12 15:34:53 -0700
commit1966af81760aea2966f8f218d442aed5f296b992 (patch)
tree24f8bdee3c38ce4a3d02db374202088147048575 /builtin-pack-objects.c
parentdb12d97542762cdb54d332ea047122f1071132b5 (diff)
parentbc69776aa12c68958e381e8c24e8faa172dde2d8 (diff)
downloadgit-1966af81760aea2966f8f218d442aed5f296b992.tar.gz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 9fc3b35547..6cf5b86e15 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)