diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:19 -0700 |
| commit | f817f2fbb5e3dbe49be446438838a11b192c2715 (patch) | |
| tree | 631f27ce82032851689e962945ce2fa5c5b06a9e /upload-pack.c | |
| parent | cd4093b6036af696310b1867e9e916485d53ccf4 (diff) | |
| parent | beba25abbc34a07e07ce933210cda15202ef76cc (diff) | |
| download | git-f817f2fbb5e3dbe49be446438838a11b192c2715.tar.gz git-f817f2fbb5e3dbe49be446438838a11b192c2715.tar.xz | |
Merge branch 'jc/traverse-commit-list'
* jc/traverse-commit-list:
revision.c: update show_object_with_name() without using malloc()
revision.c: add show_object_with_name() helper function
rev-list: fix finish_object() call
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/upload-pack.c b/upload-pack.c index 8739bfacd..31686712c 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -86,20 +86,7 @@ static void show_commit(struct commit *commit, void *data) 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 *name = path_name(path, component); - const char *ep = strchr(name, '\n'); - if (ep) { - 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(obj->sha1), name); - free((char *)name); + show_object_with_name(pack_pipe, obj, path, component); } static void show_edge(struct commit *commit) |