unbundle: extend object verification for fetches

The existing fetch.fsckObjects and transfer.fsckObjects configurations
were not fully applied to bundle-involved fetches, including direct
bundle fetches and bundle-uri enabled fetches. Furthermore, there was no
object verification support for unbundle.

This commit extends object verification support in `bundle.c:unbundle`
by adding the `VERIFY_BUNDLE_FSCK` option to `verify_bundle_flags`. When
this option is enabled, we append the `--fsck-objects` flag to
`git-index-pack`.

The `VERIFY_BUNDLE_FSCK` option is now used by bundle-involved fetches,
where we use `fetch-pack.c:fetch_pack_fsck_objects` to determine whether
to enable this option for `bundle.c:unbundle`, specifically in:

- `transport.c:fetch_refs_from_bundle` for direct bundle fetches.
- `bundle-uri.c:unbundle_from_file` for bundle-uri enabled fetches.

This addition ensures a consistent logic for object verification during
fetches. Tests have been added to confirm functionality in the scenarios
mentioned above.

Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Xing Xin <xingxin.xx@bytedance.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bundle-uri.c b/bundle-uri.c
index 65666a11d9c0289426ccec0b8cfedeff9ef904fc..ed9b49fdbc13168d1cd021d20fff7cefc589b3c9 100644 (file)
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -9,6 +9,7 @@
 #include "hashmap.h"
 #include "pkt-line.h"
 #include "config.h"
+#include "fetch-pack.h"
 #include "remote.h"
 
 static struct {
@@ -373,7 +374,7 @@ static int unbundle_from_file(struct repository *r, const char *file)
         * the prerequisite commits.
         */
        if ((result = unbundle(r, &header, bundle_fd, NULL,
-                              VERIFY_BUNDLE_QUIET)))
+                              VERIFY_BUNDLE_QUIET | (fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0))))
                return 1;
 
        /*

diff --git a/bundle.c b/bundle.c
index 95367c2d0a06dd69cc36114ebae5a28aab8a9700..f124a2a5626685dac5e29c9d90033b5e861d0f66 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -625,6 +625,9 @@ int unbundle(struct repository *r, struct bundle_header *header,
        if (header->filter.choice)
                strvec_push(&ip.args, "--promisor=from-bundle");
 
+       if (flags & VERIFY_BUNDLE_FSCK)
+               strvec_push(&ip.args, "--fsck-objects");
+
        if (extra_index_pack_args) {
                strvec_pushv(&ip.args, extra_index_pack_args->v);
                strvec_clear(extra_index_pack_args);

diff --git a/bundle.h b/bundle.h
index 021adbdcbb3d9b482a08b304a80e62264e1a3630..5ccc9a061a4dd22d4a518b3d0243c61324619fa5 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -33,6 +33,7 @@ int create_bundle(struct repository *r, const char *path,
 enum verify_bundle_flags {
        VERIFY_BUNDLE_VERBOSE = (1 << 0),
        VERIFY_BUNDLE_QUIET = (1 << 1),
+       VERIFY_BUNDLE_FSCK = (1 << 2),
 };
 
 int verify_bundle(struct repository *r, struct bundle_header *header,

diff --git a/t/t5558-clone-bundle-uri.sh b/t/t5558-clone-bundle-uri.sh
index a0895913fe9f6f372e7d47b6d49e28f44742ab8b..cd05321e1764b557466d7057f538675162bccca8 100755 (executable)
--- a/t/t5558-clone-bundle-uri.sh
+++ b/t/t5558-clone-bundle-uri.sh
@@ -36,7 +36,22 @@ test_expect_success 'create bundle' '
                sed -e "/^$/q" -e "s/$commit_a /$commit_b /" \
                        <A.bundle >bad-header.bundle &&
                convert_bundle_to_pack \
-                       <A.bundle >>bad-header.bundle
+                       <A.bundle >>bad-header.bundle &&
+
+               tree_b=$(git rev-parse B^{tree}) &&
+               cat >data <<-EOF &&
+               tree $tree_b
+               parent $commit_b
+               author A U Thor
+               committer A U Thor
+
+               commit: this is a commit with bad emails
+
+               EOF
+               bad_commit=$(git hash-object --literally -t commit -w --stdin <data) &&
+               git branch bad $bad_commit &&
+               git bundle create bad-object.bundle bad &&
+               git update-ref -d refs/heads/bad
        )
 '
 
@@ -58,6 +73,23 @@ test_expect_success 'clone with bundle that has bad header' '
        test_grep ! "refs/bundles/" refs
 '
 
+test_expect_success 'clone with bundle that has bad object' '
+       # Unbundle succeeds if no fsckObjects configured.
+       git clone --bundle-uri="clone-from/bad-object.bundle" \
+               clone-from clone-bad-object-no-fsck &&
+       git -C clone-bad-object-no-fsck for-each-ref --format="%(refname)" >refs &&
+       grep "refs/bundles/" refs >actual &&
+       test_write_lines refs/bundles/bad >expect &&
+       test_cmp expect actual &&
+
+       # Unbundle fails with fsckObjects set true, but clone can still proceed.
+       git -c fetch.fsckObjects=true clone --bundle-uri="clone-from/bad-object.bundle" \
+               clone-from clone-bad-object-fsck 2>err &&
+       test_grep "missingEmail" err &&
+       git -C clone-bad-object-fsck for-each-ref --format="%(refname)" >refs &&
+       test_grep ! "refs/bundles/" refs
+'
+
 test_expect_success 'clone with path bundle and non-default hash' '
        test_when_finished "rm -rf clone-path-non-default-hash" &&
        GIT_DEFAULT_HASH=sha256 git clone --bundle-uri="clone-from/B.bundle" \

diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 0d1e92d9963554323a0e9a3891e43eeb263b1aff..489c6570da5537f52d7edfd498502cb7884d5f47 100755 (executable)
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -138,6 +138,41 @@ test_expect_success 'fetch SHA-1 from bundle' '
        git fetch --no-tags foo/tip.bundle "$(cat hash)"
 '
 
+test_expect_success 'clone bundle with different fsckObjects configurations' '
+       test_create_repo bundle-fsck &&
+       (
+               cd bundle-fsck &&
+               test_commit A &&
+               commit_a=$(git rev-parse A) &&
+               tree_a=$(git rev-parse A^{tree}) &&
+               cat >data <<-EOF &&
+               tree $tree_a
+               parent $commit_a
+               author A U Thor
+               committer A U Thor
+
+               commit: this is a commit with bad emails
+
+               EOF
+               bad_commit=$(git hash-object --literally -t commit -w --stdin <data) &&
+               git branch bad $bad_commit &&
+               git bundle create bad.bundle bad
+       ) &&
+
+       git clone bundle-fsck/bad.bundle bundle-no-fsck &&
+
+       git -c fetch.fsckObjects=false -c transfer.fsckObjects=true \
+               clone bundle-fsck/bad.bundle bundle-fetch-no-fsck &&
+
+       test_must_fail git -c fetch.fsckObjects=true \
+               clone bundle-fsck/bad.bundle bundle-fetch-fsck 2>err &&
+       test_grep "missingEmail" err &&
+
+       test_must_fail git -c transfer.fsckObjects=true \
+               clone bundle-fsck/bad.bundle bundle-transfer-fsck 2>err &&
+       test_grep "missingEmail" err
+'
+
 test_expect_success 'git bundle uses expected default format' '
        git bundle create bundle HEAD^.. &&
        cat >expect <<-EOF &&

diff --git a/transport.c b/transport.c
index 83ddea8fbc03875b6a9683b37f1fbc27d3d2984b..9e84784a7d79a4ad7ccb3a5f706136eb8c58cf37 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -184,7 +184,8 @@ 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, 0);
+                      &extra_index_pack_args,
+                      fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0);
        transport->hash_algo = data->header.hash_algo;
        return ret;
 }