Merge branch 'mm/mediawiki-author-fix'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index fd40410837b50a79063d2f524246f627629dca55..ba3705d1de0d91714be4c967a26ffd263e09878c 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -805,7 +805,7 @@ static int add_object_entry(const unsigned char *sha1, enum object_type type,
                if (offset) {
                        if (!found_pack) {
                                if (!is_pack_valid(p)) {
-                                       error("packfile %s cannot be accessed", p->pack_name);
+                                       warning("packfile %s cannot be accessed", p->pack_name);
                                        continue;
                                }
                                found_offset = offset;
@@ -2077,7 +2077,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);