summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
commit2e2e7e9dd07107af8ce96428929775f267fdf98a (patch)
tree2ad475466a598a0004fa13cb0e5a5eb53fa559e2 /upload-pack.c
parentca0c9764bfe4f5d33551b5cca74eb0966f796baf (diff)
parent6b67e0dc068d1bfd07686071b70f60078380666f (diff)
downloadgit-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.gz
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()
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c4
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);
}