diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:17 -0700 |
| commit | 9824a388e53ba0951e38f246038fa0ef6fda3397 (patch) | |
| tree | afae88c319c71b70dfd76de729222af8490f2dd0 /list-objects.h | |
| parent | Merge branch 'nd/archive-attribute' (diff) | |
| parent | show_object(): push path_name() call further down (diff) | |
| download | tgif-9824a388e53ba0951e38f246038fa0ef6fda3397.tar.xz | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.h b/list-objects.h index 47fae2e468..d65dbf03e6 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 *); |