diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:36:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:36:20 (GMT) |
| commit | 2e2e7e9dd07107af8ce96428929775f267fdf98a (patch) | |
| tree | 2ad475466a598a0004fa13cb0e5a5eb53fa559e2 /builtin/pack-objects.c | |
| parent | ca0c9764bfe4f5d33551b5cca74eb0966f796baf (diff) | |
| parent | 6b67e0dc068d1bfd07686071b70f60078380666f (diff) | |
| download | git-2e2e7e9dd07107af8ce96428929775f267fdf98a.zip git-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.gz git-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.bz2 | |
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 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a9c67c1..2b18de5 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); |