From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff: skip GITLINK when lazy fetching missing objs
Date: Tue, 20 Aug 2019 14:18:40 -0700 [thread overview]
Message-ID: <xmqqblwjtu1b.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190820205320.139006-1-jonathantanmy@google.com> (Jonathan Tan's message of "Tue, 20 Aug 2019 13:53:20 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
> In 7fbbcb21b1 ("diff: batch fetching of missing blobs", 2019-04-08),
> diff was taught to batch the fetching of missing objects when operating
> on a partial clone, but was not taught to refrain from fetching
> GITLINKs. Teach diff to check if an object is a GITLINK before including
> it in the set to be fetched.
OK, so in a lazy repository, running "git diff" (or "git log") could
have resulted in "git fetch" of a history of a submodule, which may
likely have failed?
> (As stated in the commit message of that commit, unpack-trees was also
> taught a similar thing prior, but unpack-trees correctly checks for
> GITLINK before including objects in the set to be fetched.)
> ---
Sign-off?
> One of my colleagues noticed this when switching branches in a
> superproject with a dirty working tree (hence triggering the diff
> mechanism). The test I included in this commit tests a simpler use case,
> but I've verified that this solves my colleague's case too.
> ---
> diff.c | 1 +
> t/t4067-diff-partial-clone.sh | 31 +++++++++++++++++++++++++++++++
> 2 files changed, 32 insertions(+)
>
> diff --git a/diff.c b/diff.c
> index efe42b341a..e28b463f57 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -6512,6 +6512,7 @@ static void add_if_missing(struct repository *r,
> const struct diff_filespec *filespec)
> {
> if (filespec && filespec->oid_valid &&
> + !S_ISGITLINK(filespec->mode) &&
> oid_object_info_extended(r, &filespec->oid, NULL,
> OBJECT_INFO_FOR_PREFETCH))
> oid_array_append(to_fetch, &filespec->oid);
Makes sense.
Thanks.
next prev parent reply other threads:[~2019-08-20 21:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 20:53 [PATCH] diff: skip GITLINK when lazy fetching missing objs Jonathan Tan
2019-08-20 21:18 ` Junio C Hamano [this message]
2019-08-20 21:39 ` Jonathan Tan
2019-08-22 4:15 ` Jeff King
2019-08-22 16:25 ` Jonathan Tan
2019-08-22 17:10 ` Jeff King
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=xmqqblwjtu1b.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).