diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-17 14:30:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-22 11:34:55 -0700 |
| commit | 91f175165aba17903ab928da543052ea335fc924 (patch) | |
| tree | 6cf82414eee956998260894e995f621e8892e818 /upload-pack.c | |
| parent | 5f25b6299d3e9853cf1f43734228d6e25d8f3415 (diff) | |
| download | git-91f175165aba17903ab928da543052ea335fc924.tar.gz | |
revision.c: add show_object_with_name() helper function
There are two copies of traverse_commit_list callback that show the object
name followed by pathname the object was found, to produce output similar
to "rev-list --objects".
Unify them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ce5cbbea6b..970a1eba13 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -85,20 +85,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) |