From: Christian Couder Date: Wed, 03 Jan 2018 16:33:30 GMT Subject: [PATCH 07/40] fsck: support promisor objects as CLI argument Message-ID: <20180103163403.11303-8-chriscool@tuxfamily.org> In-Reply-To: <20180103163403.11303-1-chriscool@tuxfamily.org> From: Jonathan Tan Teach fsck to not treat missing promisor objects provided on the CLI as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- builtin/fsck.c | 2 ++ t/t0410-partial-clone.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/builtin/fsck.c b/builtin/fsck.c index b8bcb0e40c..a6fa6d6482 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -750,6 +750,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) struct object *obj = lookup_object(oid.hash); if (!obj || !(obj->flags & HAS_OBJ)) { + if (is_promisor_object(&oid)) + continue; error("%s: object missing", oid_to_hex(&oid)); errors_found |= ERROR_OBJECT; continue; diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 46c88e8dfa..a0f901fa1d 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial-clone.sh @@ -125,4 +125,17 @@ test_expect_success 'missing object, but promised, passes fsck' ' git -C repo fsck ' +test_expect_success 'missing CLI object, but promised, passes fsck' ' + rm -rf repo && + test_create_repo repo && + test_commit -C repo my_commit && + + A=$(git -C repo commit-tree -m a HEAD^{tree}) && + promise_and_delete "$A" && + + git -C repo config core.repositoryformatversion 1 && + git -C repo config odb.magic.promisorRemote "arbitrary string" && + git -C repo fsck "$A" +' + test_done -- 2.16.0.rc0.16.g82191dbc6c.dirty