From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH 5/9] fsck: support promisor objects as CLI argument
Date: Thu, 2 Nov 2017 20:20:48 +0000 [thread overview]
Message-ID: <20171102202052.58762-6-git@jeffhostetler.com> (raw)
In-Reply-To: <20171102202052.58762-1-git@jeffhostetler.com>
From: Jonathan Tan <jonathantanmy@google.com>
Teach fsck to not treat missing promisor objects provided on the CLI as
an error when extensions.partialcloneremote is set.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
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 4c2a56d..578a7c8 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 b1d404e..002e071 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 extensions.partialcloneremote "arbitrary string" &&
+ git -C repo fsck "$A"
+'
+
test_done
--
2.9.3
next prev parent reply other threads:[~2017-11-02 20:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 20:20 [PATCH 0/9] WIP Partial clone part 2: fsck and promisors Jeff Hostetler
2017-11-02 20:20 ` [PATCH 1/9] extension.partialclone: introduce partial clone extension Jeff Hostetler
2017-11-02 22:24 ` Jonathan Tan
2017-11-03 13:57 ` Jeff Hostetler
2017-11-03 18:39 ` Jonathan Tan
2017-11-06 17:32 ` Jeff Hostetler
2017-11-06 19:16 ` Jonathan Tan
2017-11-08 20:32 ` Jeff Hostetler
2017-11-08 21:51 ` Jonathan Tan
2017-11-08 22:11 ` Jeff Hostetler
2017-11-16 17:33 ` Jeff Hostetler
2017-11-02 20:20 ` [PATCH 2/9] fsck: introduce partialclone extension Jeff Hostetler
2017-11-02 20:20 ` [PATCH 3/9] fsck: support refs pointing to promisor objects Jeff Hostetler
2017-11-02 20:20 ` [PATCH 4/9] fsck: support referenced " Jeff Hostetler
2017-11-02 20:20 ` Jeff Hostetler [this message]
2017-11-02 20:20 ` [PATCH 6/9] index-pack: refactor writing of .keep files Jeff Hostetler
2017-11-02 20:20 ` [PATCH 7/9] introduce fetch-object: fetch one promisor object Jeff Hostetler
2017-11-02 20:20 ` [PATCH 8/9] sha1_file: support lazily fetching missing objects Jeff Hostetler
2017-11-02 20:20 ` [PATCH 9/9] gc: do not repack promisor packfiles Jeff Hostetler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171102202052.58762-6-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).