summaryrefslogtreecommitdiff
path: root/list-objects.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-18 21:46:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-18 21:46:17 (GMT)
commit9824a388e53ba0951e38f246038fa0ef6fda3397 (patch)
treeafae88c319c71b70dfd76de729222af8490f2dd0 /list-objects.h
parent5758b25da43c401cad33f3304f78084a0305d21c (diff)
parentcf2ab916afa4231f7e9db31796e7c0f712ff6ad1 (diff)
downloadgit-9824a388e53ba0951e38f246038fa0ef6fda3397.zip
git-9824a388e53ba0951e38f246038fa0ef6fda3397.tar.gz
git-9824a388e53ba0951e38f246038fa0ef6fda3397.tar.bz2
Merge branch 'lt/pack-object-memuse'
* lt/pack-object-memuse: show_object(): push path_name() call further down process_{tree,blob}: show objects without buffering Conflicts: builtin-pack-objects.c builtin-rev-list.c list-objects.c list-objects.h upload-pack.c
Diffstat (limited to 'list-objects.h')
-rw-r--r--list-objects.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.h b/list-objects.h
index 47fae2e..d65dbf0 100644
--- a/list-objects.h
+++ b/list-objects.h
@@ -2,7 +2,7 @@
#define LIST_OBJECTS_H
typedef void (*show_commit_fn)(struct commit *, void *);
-typedef void (*show_object_fn)(struct object_array_entry *, void *);
+typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *);
typedef void (*show_edge_fn)(struct commit *);
void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);