mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/pack-object-memuse'

Browse Source 
* lt/pack-object-memuse:
  show_object(): push path_name() call further down
  process_{tree,blob}: show objects without buffering

Conflicts:
	builtin-pack-objects.c
	builtin-rev-list.c
	list-objects.c
	list-objects.h
	upload-pack.c
This commit is contained in:
Junio C Hamano
2009-04-18 14:46:17 -07:00
parent 5758b25da4 cf2ab916af
commit 9824a388e5
7 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin-pack-objects.c
View File

@ -1907,13 +1907,19 @@ static void show_commit(struct commit *commit, void *data)
commit->object.flags |= OBJECT_ADDED;
}
static void show_object(struct object_array_entry *p, void *data)
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)