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 3/4] fsck: support referenced lazy objects
Date: Thu, 27 Jul 2017 12:17:37 -0700 [thread overview]
Message-ID: <xmqqpocln0z2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1d841f0e4188f0ae9fa3c238c58d3e1b5fb232e8.1501111615.git.jonathantanmy@google.com> (Jonathan Tan's message of "Wed, 26 Jul 2017 16:30:01 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
> Teach fsck to not treat missing objects indirectly pointed to by refs as
> an error when extensions.lazyobject is set.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> builtin/fsck.c | 11 +++++++++++
> t/t0410-lazy-object.sh | 27 +++++++++++++++++++++++++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index e29ff760b..238532cc2 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
> return 0;
> obj->flags |= REACHABLE;
> if (!(obj->flags & HAS_OBJ)) {
> + if (repository_format_lazy_object)
> + /*
> + * Return immediately; this is not an error, and further
> + * recursion does not need to be performed on this
> + * object since it is missing (so it does not need to be
> + * added to "pending").
> + */
> + return 0;
> +
The same comment as 2/4 applies here.
> @@ -212,6 +221,8 @@ static void check_reachable_object(struct object *obj)
> * do a full fsck
> */
> if (!(obj->flags & HAS_OBJ)) {
> + if (repository_format_lazy_object)
> + return;
> if (has_sha1_pack(obj->oid.hash))
> return; /* it is in pack - forget about it */
> printf("missing %s %s\n", printable_type(obj),
Also this reminds as a related issue. Imagine:
- An object X was once retrieved, perhaps but not necessarily
lazily, together with another object Y that is referred to by X
(e.g. X is a tree, Y is a blob in the directory at path D, which
is represented by X).
- The same blob Y is added to the index in a different directory at
path E.
- The user decides to make this a slimmed-down "narrow clone" style
repository and tells Git that path D is not interesting. We lose
X, but not Y because Y is still referenced from the index.
- "git reset --hard" happens, and there no longer is any reference
to Y.
Now, when we run fsck, should we diagnose Y as "unreachable and/or
dangling"?
next prev parent reply other threads:[~2017-07-27 19:17 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
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 [this message]
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:21 ` 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
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
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=xmqqpocln0z2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peartben@gmail.com \
/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).