summaryrefslogtreecommitdiff
path: root/builtin/rev-list.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-17 21:30:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-22 18:34:55 (GMT)
commit91f175165aba17903ab928da543052ea335fc924 (patch)
tree6cf82414eee956998260894e995f621e8892e818 /builtin/rev-list.c
parent5f25b6299d3e9853cf1f43734228d6e25d8f3415 (diff)
downloadgit-91f175165aba17903ab928da543052ea335fc924.zip
git-91f175165aba17903ab928da543052ea335fc924.tar.gz
git-91f175165aba17903ab928da543052ea335fc924.tar.bz2
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 'builtin/rev-list.c')
-rw-r--r--builtin/rev-list.c15
1 files changed, 1 insertions, 14 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)