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

Merge branch 'lt/pack-object-memuse' into maint

Browse Source 
* lt/pack-object-memuse:
  show_object(): push path_name() call further down
  process_{tree,blob}: show objects without buffering
This commit is contained in:
Junio C Hamano
2009-05-03 15:02:40 -07:00
parent a2dc04ba15 cf2ab916af
commit 7d71be242d
7 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
upload-pack.c
View File

@ -78,20 +78,22 @@ static void show_commit(struct commit *commit)
commit->buffer = NULL;
}
static void show_object(struct object_array_entry *p)
static void show_object(struct object *obj, const struct name_path *path, const char *component)
{
/* An object with name "foo\n0000000..." can be used to
* confuse downstream git-pack-objects very badly.
*/
const char *ep = strchr(p->name, '\n');
const char *name = path_name(path, component);
const char *ep = strchr(name, '\n');
if (ep) {
fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(p->item->sha1),
(int) (ep - p->name),
p->name);
fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
(int) (ep - name),
name);
}
else
fprintf(pack_pipe, "%s %s\n",
sha1_to_hex(p->item->sha1), p->name);
sha1_to_hex(obj->sha1), name);
free((char *)name);
}
static void show_edge(struct commit *commit)