transport: propagate fsck configuration during bundle fetch

When fetching directly from a bundle, fsck message severity
configuration is not propagated to the underlying git-index-pack(1). It
is only capable of enabling or disabling fsck checks entirely. This does
not align with the fsck behavior for fetches through git-fetch-pack(1).

Use the fsck config parsing from fetch-pack to populate fsck message
severity configuration and wire it through to `unbundle()` to enable the
same fsck verification as done through fetch-pack.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 7ceaa8194d83f4c11fd80b89498969450c34a979..c69aa88eaea50178a22793269b888e49456b82e3 100755 (executable)
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -171,6 +171,13 @@ test_expect_success 'clone bundle with different fsckObjects configurations' '
 
        test_must_fail git -c transfer.fsckObjects=true \
                clone bundle-fsck/bad.bundle bundle-transfer-fsck 2>err &&
+       test_grep "missingEmail" err &&
+
+       git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=ignore \
+               clone bundle-fsck/bad.bundle bundle-fsck-ignore &&
+
+       test_must_fail git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=error \
+               clone bundle-fsck/bad.bundle bundle-fsck-error 2>err &&
        test_grep "missingEmail" err
 '
 

diff --git a/transport.c b/transport.c
index 8536b141814262218807617f3b9de7bc5a0ed062..6966df51a8c014400d5bace04cc2143a0867d64b 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -19,6 +19,7 @@
 #include "branch.h"
 #include "url.h"
 #include "submodule.h"
+#include "strbuf.h"
 #include "string-list.h"
 #include "oid-array.h"
 #include "sigchain.h"
@@ -172,6 +173,19 @@ static struct ref *get_refs_from_bundle(struct transport *transport,
        return result;
 }
 
+static int fetch_fsck_config_cb(const char *var, const char *value,
+                               const struct config_context *ctx UNUSED, void *cb)
+{
+       struct strbuf *msg_types = cb;
+       int ret;
+
+       ret = fetch_pack_fsck_config(var, value, msg_types);
+       if (ret > 0)
+               return 0;
+
+       return ret;
+}
+
 static int fetch_refs_from_bundle(struct transport *transport,
                                  int nr_heads UNUSED,
                                  struct ref **to_fetch UNUSED)
@@ -181,6 +195,7 @@ static int fetch_refs_from_bundle(struct transport *transport,
        };
        struct bundle_transport_data *data = transport->data;
        struct strvec extra_index_pack_args = STRVEC_INIT;
+       struct strbuf msg_types = STRBUF_INIT;
        int ret;
 
        if (transport->progress)
@@ -188,11 +203,16 @@ static int fetch_refs_from_bundle(struct transport *transport,
 
        if (!data->get_refs_from_bundle_called)
                get_refs_from_bundle_inner(transport);
+
+       git_config(fetch_fsck_config_cb, &msg_types);
+       opts.fsck_msg_types = msg_types.buf;
+
        ret = unbundle(the_repository, &data->header, data->fd,
                       &extra_index_pack_args, &opts);
        transport->hash_algo = data->header.hash_algo;
 
        strvec_clear(&extra_index_pack_args);
+       strbuf_release(&msg_types);
        return ret;
 }