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()
This commit is contained in:
Junio C Hamano
2011-10-05 12:36:20 -07:00
9 changed files with 107 additions and 77 deletions

View File

@ -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);