[PATCH 2/3] revision.c: add show_object_with_name() helper function
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 17, 2011, 21:30 UTC
- Message-ID
- <1313616635-25331-3-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1313616635-25331-1-git-send-email-gitster@pobox.com>
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> --- builtin/rev-list.c | 15 +-------------- revision.c | 19 +++++++++++++++++++ revision.h | 2 ++ upload-pack.c | 15 +-------------- 4 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index d789279..f5ce487 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -176,21 +176,8 @@ static void finish_object(struct object *obj, const struct name_path *path, cons static void show_object(struct object *obj, const struct name_path *path, const char *component) { - char *name = path_name(path, component); - /* An object with name "foo\n0000000..." can be used to - * confuse downstream "git pack-objects" very badly. - */ - const char *ep = strchr(name, '\n'); - finish_object(obj, path, component); - if (ep) { - printf("%s %.*s\n", sha1_to_hex(obj->sha1), - (int) (ep - name), - name); - } - else - printf("%s %s\n", sha1_to_hex(obj->sha1), name); - free(name); + show_object_with_name(stdout, obj, path, component); } static void show_edge(struct commit *commit) diff --git a/revision.c b/revision.c index c46cfaa..c5b38cc 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, diff --git a/revision.h b/revision.h index 3d64ada..da00a58 100644 --- a/revision.h +++ b/revision.h @@ -185,6 +185,8 @@ struct name_path { char *path_name(const struct name_path *path, const char *name); +extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *); + extern void add_object(struct object *obj, struct object_array *p, struct name_path *path, diff --git a/upload-pack.c b/upload-pack.c index ce5cbbe..970a1eb 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)
-- 1.7.6.472.g4bfe7c