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/upload-pack.c b/upload-pack.c
index 31686712c7..470cffd7c1 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -84,7 +84,9 @@ static void show_commit(struct commit *commit, void *data)
 	commit->buffer = NULL;
 }
 
-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)
 {
 	show_object_with_name(pack_pipe, obj, path, component);
 }