From: Junio C Hamano <gitster@pobox.com>
To: Xin Li <delphij@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v6 2/4] fetch: allow adding a filter after initial clone
Date: Fri, 05 Jun 2020 12:15:16 -0700 [thread overview]
Message-ID: <xmqqtuzpmiij.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200605091004.208668-3-delphij@google.com> (Xin Li's message of "Fri, 5 Jun 2020 02:10:02 -0700")
Xin Li <delphij@google.com> writes:
> Retroactively adding a filter can be useful for existing shallow clones as
> they allow users to see earlier change histories without downloading all
> git objects in a regular --unshallow fetch.
>
> Without this patch, users can make a clone partial by editing the
> repository configuration to convert the remote into a promisor, like:
>
> git config core.repositoryFormatVersion 1
> git config extensions.partialClone origin
> git fetch --unshallow --filter=blob:none origin
>
> Since the hard part of making this work is already in place and such
> edits can be error-prone, teach Git to perform the required configuration
> change automatically instead.
>
> Note that this change does not modify the existing git behavior which
> recognizes setting extensions.partialClone without changing
> repositoryFormatVersion.
Hmph, I am not sure which part of the above corresponds to the
removal of "in a repository without extensions.partialClone you
cannot use the --filter option" logic. With or without this patch,
users can butcher $GIT_DIR/config and pretend that the repository
was created with the pertial clone extension from the beginning, but
this step is not about automating those tasks, it seems.
>
> Signed-off-by: Xin Li <delphij@google.com>
> ---
> builtin/fetch.c | 3 ---
> t/t0410-partial-clone.sh | 12 ++++++++++++
> t/t1090-sparse-checkout-scope.sh | 1 -
> t/t5500-fetch-pack.sh | 1 -
> t/t5702-protocol-v2.sh | 1 -
> 5 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index b5788c16bf..3347d578ea 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1790,9 +1790,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
> if (depth || deepen_since || deepen_not.nr)
> deepen = 1;
>
> - if (filter_options.choice && !has_promisor_remote())
> - die("--filter can only be used when extensions.partialClone is set");
> -
> if (all) {
> if (argc == 1)
> die(_("fetch --all does not take a repository argument"));
> diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
> index a3988bd4b8..16ad000382 100755
> --- a/t/t0410-partial-clone.sh
> +++ b/t/t0410-partial-clone.sh
> @@ -30,6 +30,18 @@ test_expect_success 'extensions.partialclone without filter' '
> git -C client fetch origin
> '
>
> +test_expect_success 'convert shallow clone to partial clone' '
> + rm -fr server client &&
> + test_create_repo server &&
> + test_commit -C server my_commit 1 &&
> + test_commit -C server my_commit2 1 &&
> + git clone --depth=1 "file://$(pwd)/server" client &&
> + git -C client fetch --unshallow --filter="blob:none" &&
> + test_cmp_config -C client true remote.origin.promisor &&
> + test_cmp_config -C client blob:none remote.origin.partialclonefilter &&
> + test_cmp_config -C client 1 core.repositoryformatversion
> +'
> +
> test_expect_success 'missing reflog object, but promised by a commit, passes fsck' '
> rm -rf repo &&
> test_create_repo repo &&
> diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
> index 40cc004326..f35a73dd20 100755
> --- a/t/t1090-sparse-checkout-scope.sh
> +++ b/t/t1090-sparse-checkout-scope.sh
> @@ -63,7 +63,6 @@ test_expect_success 'in partial clone, sparse checkout only fetches needed blobs
> git -C server commit -m message &&
>
> test_config -C client core.sparsecheckout 1 &&
> - test_config -C client extensions.partialclone origin &&
> echo "!/*" >client/.git/info/sparse-checkout &&
> echo "/a" >>client/.git/info/sparse-checkout &&
> git -C client fetch --filter=blob:none origin &&
> diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> index 8c54e34ef1..0f5ff25179 100755
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -999,7 +999,6 @@ fetch_filter_blob_limit_zero () {
> test_config -C "$SERVER" uploadpack.allowfilter 1 &&
>
> git clone "$URL" client &&
> - test_config -C client extensions.partialclone origin &&
>
> test_commit -C "$SERVER" two &&
>
> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
> index 5039e66dc4..8b27fad6cd 100755
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -348,7 +348,6 @@ test_expect_success 'partial fetch' '
> rm -rf client "$(pwd)/trace" &&
> git init client &&
> SERVER="file://$(pwd)/server" &&
> - test_config -C client extensions.partialClone "$SERVER" &&
>
> GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
> fetch --filter=blob:none "$SERVER" master:refs/heads/other &&
next prev parent reply other threads:[~2020-06-05 19:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 20:00 [PATCH] fetch: allow adding a filter after initial clone Xin Li
2020-05-13 20:43 ` Junio C Hamano
2020-05-13 21:41 ` Xin Li
2020-05-13 22:07 ` Junio C Hamano
2020-05-13 22:18 ` Junio C Hamano
2020-05-13 23:44 ` brian m. carlson
2020-05-28 2:53 ` [PATCH v2 0/1] " Xin Li
2020-05-28 2:54 ` [PATCH v2 1/1] " Xin Li
2020-05-28 3:28 ` Jonathan Nieder
2020-05-28 4:08 ` [PATCH v3] " Xin Li
2020-05-28 15:04 ` [PATCH v2 1/1] " Junio C Hamano
2020-05-28 17:19 ` Jonathan Nieder
2020-05-28 19:12 ` Xin Li
2020-05-28 19:17 ` Jonathan Nieder
2020-05-29 0:04 ` [PATCH v4] " Xin Li
2020-05-29 0:41 ` Junio C Hamano
2020-05-29 18:00 ` Junio C Hamano
2020-05-29 1:01 ` Jonathan Nieder
2020-05-29 6:44 ` [PATCH v5] " Xin Li
2020-05-29 6:54 ` [PATCH v4] " Xin Li
2020-05-29 18:06 ` Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 0/4] " Xin Li
2020-06-05 9:10 ` [PATCH v6 1/4] repository: add a helper function to perform repository format upgrade Xin Li
2020-06-05 19:12 ` Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 2/4] fetch: allow adding a filter after initial clone Xin Li
2020-06-05 19:15 ` Junio C Hamano [this message]
2020-06-05 9:10 ` [PATCH v6 3/4] sparse-checkout: upgrade repository to version 1 when enabling extension Xin Li
2020-06-05 19:21 ` Junio C Hamano
2020-06-05 9:10 ` [PATCH v6 4/4] check_repository_format_gently(): refuse extensions for old repositories Xin Li
2020-06-08 16:59 ` Junio C Hamano
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=xmqqtuzpmiij.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=delphij@google.com \
--cc=git@vger.kernel.org \
/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).