Merge branch 'jc/fetch-verify'

* jc/fetch-verify:
  fetch: verify we have everything we need before updating our ref
  rev-list --verify-object
  list-objects: pass callback data to show_objects()

1 files changed, 3 insertions, 1 deletions

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a9c67c18ba..2b18de5dc3 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2073,7 +2073,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);