bundle: add flags to verify_bundle()

[thirdparty/git.git] / transport.c

diff --git a/transport.c b/transport.c
index 52db7a3cb09fa6129e399c82f404a574884053b3..de4d88687ca5da7455b4ce2170f19f55b4d81d3f 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -178,7 +178,7 @@ static int fetch_refs_from_bundle(struct transport *transport,
        if (!data->get_refs_from_bundle_called)
                get_refs_from_bundle_inner(transport);
        ret = unbundle(the_repository, &data->header, data->fd,
-                      &extra_index_pack_args);
+                      &extra_index_pack_args, 0);
        transport->hash_algo = data->header.hash_algo;
        return ret;
 }
@@ -940,7 +940,7 @@ static int external_specification_len(const char *url)
        return strchr(url, ':') - url;
 }
 
-static const struct string_list *protocol_whitelist(void)
+static const struct string_list *protocol_allow_list(void)
 {
        static int enabled = -1;
        static struct string_list allowed = STRING_LIST_INIT_DUP;
@@ -1020,9 +1020,9 @@ static enum protocol_allow_config get_protocol_config(const char *type)
 
 int is_transport_allowed(const char *type, int from_user)
 {
-       const struct string_list *whitelist = protocol_whitelist();
-       if (whitelist)
-               return string_list_has_string(whitelist, type);
+       const struct string_list *allow_list = protocol_allow_list();
+       if (allow_list)
+               return string_list_has_string(allow_list, type);
 
        switch (get_protocol_config(type)) {
        case PROTOCOL_ALLOW_ALWAYS: