From: Junio C Hamano <gitster@pobox•com>
To: Jonathan Tan <jonathantanmy@google•com>
Cc: git@vger•kernel.org, peartben@gmail•com, christian.couder@gmail•com
Subject: Re: [RFC PATCH 2/4] fsck: support refs pointing to lazy objects
Date: Thu, 27 Jul 2017 11:59:47 -0700 [thread overview]
Message-ID: <xmqqvamdn1ss.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <4c8bc7ab543d8d0d60719f65bd8a150c66123056.1501111615.git.jonathantanmy@google.com> (Jonathan Tan's message of "Wed, 26 Jul 2017 16:30:00 -0700")
Jonathan Tan <jonathantanmy@google•com> writes:
> Teach fsck to not treat refs with missing targets as an error when
> extensions.lazyobject 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-lazy-object.sh | 20 ++++++++++++++++++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index 1cfb8d98c..e29ff760b 100644
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -438,6 +438,14 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
>
> obj = parse_object(oid);
> if (!obj) {
> + if (repository_format_lazy_object) {
> + /*
> + * 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;
At this point, do we know (or can we tell) if this is a missing
object or a file exists as a loose object but is corrupt? If we
could, it would be nice to do this only for the former to avoid
sweeping a real corruption that is unrelated to the lazy fetch under
the rug.
> +test_expect_success 'fsck fails on lazy object pointed to by ref' '
> + rm -rf repo &&
> + test_create_repo repo &&
> + test_commit -C repo 1 &&
> +
> + A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
> +
> + # Reference $A only from ref, and delete it
> + git -C repo branch mybranch "$A" &&
> + delete_object repo "$A" &&
> +
> + test_must_fail git -C repo fsck
> +'
And a new test that uses a helper different from delete_object
(perhaps call it corrupt_object?) can be used to make sure that we
complain in that case here.
> +test_expect_success '...but succeeds if lazyobject is set' '
> + git -C repo config core.repositoryformatversion 1 &&
> + git -C repo config extensions.lazyobject "arbitrary string" &&
> + git -C repo fsck
> +'
> +
> test_done
next prev parent reply other threads:[~2017-07-27 19:00 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-26 23:29 [RFC PATCH 0/4] Some patches for fsck for missing objects Jonathan Tan
2017-07-26 23:29 ` [RFC PATCH 1/4] environment, fsck: introduce lazyobject extension Jonathan Tan
2017-07-27 18:55 ` Junio C Hamano
2017-07-28 13:20 ` Ben Peart
2017-07-28 23:50 ` Jonathan Tan
2017-07-29 0:21 ` Junio C Hamano
2017-07-26 23:30 ` [RFC PATCH 2/4] fsck: support refs pointing to lazy objects Jonathan Tan
2017-07-27 18:59 ` Junio C Hamano [this message]
2017-07-27 23:50 ` Jonathan Tan
2017-07-28 13:29 ` Ben Peart
2017-07-28 20:08 ` [PATCH] tests: ensure fsck fails on corrupt packfiles Jonathan Tan
2017-07-26 23:30 ` [RFC PATCH 3/4] fsck: support referenced lazy objects Jonathan Tan
2017-07-27 19:17 ` Junio C Hamano
2017-07-27 23:50 ` Jonathan Tan
2017-07-29 16:04 ` Junio C Hamano
2017-07-26 23:30 ` [RFC PATCH 4/4] fsck: support lazy objects as CLI argument Jonathan Tan
2017-07-26 23:42 ` [RFC PATCH 0/4] Some patches for fsck for missing objects brian m. carlson
2017-07-27 0:24 ` Stefan Beller
2017-07-27 17:25 ` Jonathan Tan
2017-07-28 13:40 ` Ben Peart
2017-07-31 21:02 ` [PATCH v2 0/5] Fsck for lazy objects, and (now) actual invocation of loader Jonathan Tan
2017-07-31 21:02 ` [PATCH v2 1/5] environment, fsck: introduce lazyobject extension Jonathan Tan
2017-07-31 21:02 ` [PATCH v2 2/5] fsck: support refs pointing to lazy objects Jonathan Tan
2017-07-31 21:02 ` [PATCH v2 3/5] fsck: support referenced " Jonathan Tan
2017-07-31 21:02 ` [PATCH v2 4/5] fsck: support lazy objects as CLI argument Jonathan Tan
2017-07-31 21:02 ` [PATCH v2 5/5] sha1_file: support loading lazy objects Jonathan Tan
2017-07-31 21:29 ` Junio C Hamano
2017-08-08 20:20 ` Ben Peart
2017-07-31 21:21 ` [PATCH v2 0/5] Fsck for lazy objects, and (now) actual invocation of loader Junio C Hamano
2017-07-31 23:05 ` Jonathan Tan
2017-08-01 17:11 ` Junio C Hamano
2017-08-01 17:45 ` Jonathan Nieder
2017-08-01 20:15 ` Junio C Hamano
2017-08-02 0:19 ` Jonathan Tan
2017-08-02 16:20 ` Junio C Hamano
2017-08-02 17:38 ` Jonathan Nieder
2017-08-02 20:51 ` Junio C Hamano
2017-08-02 22:13 ` Jonathan Nieder
2017-08-03 19:08 ` Jonathan Tan
2017-08-08 17:13 ` Ben Peart
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvamdn1ss.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jonathantanmy@google$(echo .)com \
--cc=peartben@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox