diff options
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/pack-objects.c | 4 | ||||
-rw-r--r-- | builtin/rev-list.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f402a843bb..fca6cb5635 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1936,7 +1936,9 @@ static void show_commit(struct commit *commit, void *data) commit->object.flags |= OBJECT_ADDED; } -static void show_object(struct object *obj, const struct name_path *path, const char *last) +static void show_object(struct object *obj, + const struct name_path *path, const char *last, + void *data) { char *name = path_name(path, last); diff --git a/builtin/rev-list.c b/builtin/rev-list.c index f5ce4873e3..920b91c0c3 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -168,15 +168,19 @@ static void finish_commit(struct commit *commit, void *data) commit->buffer = NULL; } -static void finish_object(struct object *obj, const struct name_path *path, const char *name) +static void finish_object(struct object *obj, + const struct name_path *path, const char *name, + void *cb_data) { if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1)) die("missing blob object '%s'", sha1_to_hex(obj->sha1)); } -static void show_object(struct object *obj, const struct name_path *path, const char *component) +static void show_object(struct object *obj, + const struct name_path *path, const char *component, + void *cb_data) { - finish_object(obj, path, component); + finish_object(obj, path, component, cb_data); show_object_with_name(stdout, obj, path, component); } |