git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com,
	christian.couder@gmail.com
Subject: [PATCH v6 04/12] fsck: support referenced promisor objects
Date: Tue,  5 Dec 2017 16:58:46 +0000	[thread overview]
Message-ID: <20171205165854.64979-5-git@jeffhostetler.com> (raw)
In-Reply-To: <20171205165854.64979-1-git@jeffhostetler.com>

From: Jonathan Tan <jonathantanmy@google.com>

Teach fsck to not treat missing promisor objects indirectly pointed to
by refs as an error when extensions.partialclone is set.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
 builtin/fsck.c           | 11 +++++++++++
 t/t0410-partial-clone.sh | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/builtin/fsck.c b/builtin/fsck.c
index ee937bb..4c2a56d 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -149,6 +149,15 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 	if (obj->flags & REACHABLE)
 		return 0;
 	obj->flags |= REACHABLE;
+
+	if (is_promisor_object(&obj->oid))
+		/*
+		 * Further recursion does not need to be performed on this
+		 * object since it is a promisor object (so it does not need to
+		 * be added to "pending").
+		 */
+		return 0;
+
 	if (!(obj->flags & HAS_OBJ)) {
 		if (parent && !has_object_file(&obj->oid)) {
 			printf("broken link from %7s %s\n",
@@ -208,6 +217,8 @@ static void check_reachable_object(struct object *obj)
 	 * do a full fsck
 	 */
 	if (!(obj->flags & HAS_OBJ)) {
+		if (is_promisor_object(&obj->oid))
+			return;
 		if (has_sha1_pack(obj->oid.hash))
 			return; /* it is in pack - forget about it */
 		printf("missing %s %s\n", printable_type(obj),
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index bf75162..4f9931f 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -102,4 +102,27 @@ test_expect_success 'missing ref object, but promised, passes fsck' '
 	git -C repo fsck
 '
 
+test_expect_success 'missing object, but promised, passes fsck' '
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo 1 &&
+	test_commit -C repo 2 &&
+	test_commit -C repo 3 &&
+	git -C repo tag -a annotated_tag -m "annotated tag" &&
+
+	C=$(git -C repo rev-parse 1) &&
+	T=$(git -C repo rev-parse 2^{tree}) &&
+	B=$(git hash-object repo/3.t) &&
+	AT=$(git -C repo rev-parse annotated_tag) &&
+
+	promise_and_delete "$C" &&
+	promise_and_delete "$T" &&
+	promise_and_delete "$B" &&
+	promise_and_delete "$AT" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck
+'
+
 test_done
-- 
2.9.3


  parent reply	other threads:[~2017-12-05 16:59 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-05 16:58 [PATCH v6 00/12] Partial clone part 2: fsck and promisors Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 01/12] extension.partialclone: introduce partial clone extension Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 02/12] fsck: introduce partialclone extension Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 03/12] fsck: support refs pointing to promisor objects Jeff Hostetler
2017-12-07 19:18   ` Brandon Williams
2017-12-07 19:27     ` Jonathan Tan
2017-12-07 19:40       ` Brandon Williams
2017-12-05 16:58 ` Jeff Hostetler [this message]
2017-12-05 16:58 ` [PATCH v6 05/12] fsck: support promisor objects as CLI argument Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 06/12] index-pack: refactor writing of .keep files Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 07/12] introduce fetch-object: fetch one promisor object Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 08/12] sha1_file: support lazily fetching missing objects Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue Jeff Hostetler
2017-12-05 20:54   ` Junio C Hamano
2017-12-05 22:02     ` Jeff Hostetler
2017-12-05 21:03   ` Junio C Hamano
2017-12-07 19:44   ` Brandon Williams
2017-12-05 16:58 ` [PATCH v6 10/12] fixup: sha1_file: add TODO Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 11/12] rev-list: support termination at promisor objects Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 12/12] gc: do not repack promisor packfiles Jeff Hostetler
2017-12-05 20:02 ` [PATCH v6 00/12] Partial clone part 2: fsck and promisors Jonathan Tan

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=20171205165854.64979-5-git@jeffhostetler.com \
    --to=git@jeffhostetler.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).