From 91f175165aba17903ab928da543052ea335fc924 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Aug 2011 14:30:34 -0700 Subject: 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 --- revision.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'revision.c') diff --git a/revision.c b/revision.c index c46cfaa3e4..c5b38cc117 100644 --- a/revision.c +++ b/revision.c @@ -40,6 +40,25 @@ char *path_name(const struct name_path *path, const char *name) return n; } +void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component) +{ + char *name = path_name(path, component); + const char *ep = strchr(name, '\n'); + + /* + * An object with name "foo\n0000000..." can be used to + * confuse downstream "git pack-objects" very badly. + */ + if (ep) { + fprintf(out, "%s %.*s\n", sha1_to_hex(obj->sha1), + (int) (ep - name), + name); + } + else + fprintf(out, "%s %s\n", sha1_to_hex(obj->sha1), name); + free(name); +} + void add_object(struct object *obj, struct object_array *p, struct name_path *path, -- cgit v1.2.3