From patchwork Wed Apr 1 12:15:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff King X-Patchwork-Id: 11469035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F1ED159A for ; Wed, 1 Apr 2020 12:15:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 272792078E for ; Wed, 1 Apr 2020 12:15:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732542AbgDAMPo (ORCPT ); Wed, 1 Apr 2020 08:15:44 -0400 Received: from cloud.peff.net ([104.130.231.41]:58180 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1732511AbgDAMPi (ORCPT ); Wed, 1 Apr 2020 08:15:38 -0400 Received: (qmail 1681 invoked by uid 109); 1 Apr 2020 12:15:38 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Wed, 01 Apr 2020 12:15:38 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 7696 invoked by uid 111); 1 Apr 2020 12:25:45 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Wed, 01 Apr 2020 08:25:45 -0400 Authentication-Results: peff.net; auth=none Date: Wed, 1 Apr 2020 08:15:37 -0400 From: Jeff King To: Konstantin Tokarev Cc: Derrick Stolee , Jonathan Tan , git@vger.kernel.org Subject: [PATCH] clone: use "quick" lookup while following tags Message-ID: <20200401121537.GA1916590@coredump.intra.peff.net> References: <2814631585342072@sas8-da6d7485e0c7.qloud-c.yandex.net> <20200328144023.GB1198080@coredump.intra.peff.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200328144023.GB1198080@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sat, Mar 28, 2020 at 10:40:23AM -0400, Jeff King wrote: > So I guess the problem is not with shallow clones specifically, but they > lead us to not having fetched the commits pointed to by tags, which > leads to us trying to fault in those commits (and their trees) rather > than realizing that we weren't meant to have them. And the size of the > local repo balloons because you're fetching all those commits one by > one, and not getting the benefit of the deltas you would when you do a > single --filter=blob:none fetch. > > I guess we need something like this: The issue is actually with --single-branch, which is implied by --depth. But the fix is the same either way. Here it is with a commit message and test. -- >8 -- Subject: [PATCH] clone: use "quick" lookup while following tags When cloning with --single-branch, we implement git-fetch's usual tag-following behavior, grabbing any tag objects that point to objects we have locally. When we're a partial clone, though, our has_object_file() check will actually lazy-fetch each tag. That not only defeats the purpose of --single-branch, but it does it incredibly slowly, potentially kicking off a new fetch for each tag. This is even worse for a shallow clone, which implies --single-branch, because even tags which are supersets of each other will be fetched individually. We can fix this by passing OBJECT_INFO_SKIP_FETCH_OBJECT to the call, which is what git-fetch does in this case. Likewise, let's include OBJECT_INFO_QUICK, as that's what git-fetch does. The rationale is discussed in 5827a03545 (fetch: use "quick" has_sha1_file for tag following, 2016-10-13), but here the tradeoff would apply even more so because clone is very unlikely to be racing with another process repacking our newly-created repository. This may provide a very small speedup even in the non-partial case case, as we'd avoid calling reprepare_packed_git() for each tag (though in practice, we'd only have a single packfile, so that reprepare should be quite cheap). Signed-off-by: Jeff King --- builtin/clone.c | 4 +++- t/t5616-partial-clone.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/builtin/clone.c b/builtin/clone.c index d8b1f413aa..9da6459f1d 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -643,7 +643,9 @@ static void write_followtags(const struct ref *refs, const char *msg) continue; if (ends_with(ref->name, "^{}")) continue; - if (!has_object_file(&ref->old_oid)) + if (!has_object_file_with_flags(&ref->old_oid, + OBJECT_INFO_QUICK | + OBJECT_INFO_SKIP_FETCH_OBJECT)) continue; update_ref(msg, ref->name, &ref->old_oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR); diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 77bb91e976..8f0d81a27e 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -415,6 +415,14 @@ test_expect_success 'verify fetch downloads only one pack when updating refs' ' test_line_count = 3 pack-list ' +test_expect_success 'single-branch tag following respects partial clone' ' + git clone --single-branch -b B --filter=blob:none \ + "file://$(pwd)/srv.bare" single && + git -C single rev-parse --verify refs/tags/B && + git -C single rev-parse --verify refs/tags/A && + test_must_fail git -C single rev-parse --verify refs/tags/C +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd