git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Brandon Williams <bmwill@google.com>
To: Jeff Hostetler <git@jeffhostetler.com>
Cc: git@vger.kernel.org, gitster@pobox.com, peff@peff.net,
	jonathantanmy@google.com, christian.couder@gmail.com
Subject: Re: [PATCH v6 03/12] fsck: support refs pointing to promisor objects
Date: Thu, 7 Dec 2017 11:18:52 -0800	[thread overview]
Message-ID: <20171207191852.GC152943@google.com> (raw)
In-Reply-To: <20171205165854.64979-4-git@jeffhostetler.com>

On 12/05, Jeff Hostetler wrote:
> From: Jonathan Tan <jonathantanmy@google.com>
> 
> Teach fsck to not treat refs referring to missing promisor objects as an
> error when extensions.partialclone is set.
> 
> For the purposes of warning about no default refs, such refs are still
> treated as legitimate refs.
> 
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
>  builtin/fsck.c           |  8 ++++++++
>  t/t0410-partial-clone.sh | 24 ++++++++++++++++++++++++
>  2 files changed, 32 insertions(+)
> 
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index 2934299..ee937bb 100644
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -434,6 +434,14 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
>  
>  	obj = parse_object(oid);
>  	if (!obj) {
> +		if (is_promisor_object(oid)) {
> +			/*
> +			 * Increment default_refs anyway, because this is a
> +			 * valid ref.
> +			 */
> +			 default_refs++;
> +			 return 0;
> +		}
>  		error("%s: invalid sha1 pointer %s", refname, oid_to_hex(oid));
>  		errors_found |= ERROR_REACHABLE;
>  		/* We'll continue with the rest despite the error.. */
> diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
> index 3ddb3b9..bf75162 100755
> --- a/t/t0410-partial-clone.sh
> +++ b/t/t0410-partial-clone.sh
> @@ -13,6 +13,14 @@ pack_as_from_promisor () {
>  	>repo/.git/objects/pack/pack-$HASH.promisor
>  }
>  
> +promise_and_delete () {
> +	HASH=$(git -C repo rev-parse "$1") &&
> +	git -C repo tag -a -m message my_annotated_tag "$HASH" &&
> +	git -C repo rev-parse my_annotated_tag | pack_as_from_promisor &&
> +	git -C repo tag -d my_annotated_tag &&
> +	delete_object repo "$HASH"
> +}
> +
>  test_expect_success 'missing reflog object, but promised by a commit, passes fsck' '
>  	test_create_repo repo &&
>  	test_commit -C repo my_commit &&
> @@ -78,4 +86,20 @@ test_expect_success 'missing reflog object alone fails fsck, even with extension
>  	test_must_fail git -C repo fsck
>  '
>  
> +test_expect_success 'missing ref object, but promised, passes fsck' '
> +	rm -rf repo &&

Instead of requiring that every test first removes 'repo', maybe you
want to have each test do its own cleanup by adding in
'test_when_finished' lines to do the removals?  Just a thought.

> +	test_create_repo repo &&
> +	test_commit -C repo my_commit &&
> +
> +	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
> +
> +	# Reference $A only from ref
> +	git -C repo branch my_branch "$A" &&
> +	promise_and_delete "$A" &&
> +
> +	git -C repo config core.repositoryformatversion 1 &&
> +	git -C repo config extensions.partialclone "arbitrary string" &&
> +	git -C repo fsck
> +'
> +
>  test_done
> -- 
> 2.9.3
> 

-- 
Brandon Williams

  reply	other threads:[~2017-12-07 19:18 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 [this message]
2017-12-07 19:27     ` Jonathan Tan
2017-12-07 19:40       ` Brandon Williams
2017-12-05 16:58 ` [PATCH v6 04/12] fsck: support referenced " Jeff Hostetler
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=20171207191852.GC152943@google.com \
    --to=bmwill@google.com \
    --cc=christian.couder@gmail.com \
    --cc=git@jeffhostetler.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).