From: Derrick Stolee <stolee@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
delphij@google.com, Huan Huan Chen <huanhuanchen@google.com>
Subject: Re: [PATCH 0/2] extensions.* fixes for 2.28 (Re: [PATCH] setup: warn about un-enabled extensions)
Date: Thu, 16 Jul 2020 08:17:03 -0400 [thread overview]
Message-ID: <e32f27f4-6469-fe68-8263-bd10a101d380@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2007161011270.54@tvgsbejvaqbjf.bet>
On 7/16/2020 4:13 AM, Johannes Schindelin wrote:
> Hi Jonathan,
>
> On Wed, 15 Jul 2020, Jonathan Nieder wrote:
>
>> Junio C Hamano wrote:
>>
>>> Here is my quick attempt to see how far we can go with the
>>> "different endgame" approach, to be applied on top of those two
>>> patches.
>>
>> Here are patches implementing the minimal fix that I'd recommend.
>> These apply against "master" without requiring any other patches
>> as prerequisites. Thoughts?
>
> IIUC all of the existing `extensions.*` predate the reverted strict check,
> right? And the idea is that future `extensions.*` will only work when
> `repositoryFormatVersion` is larger than 1, right?
>
> I would have been fine with Junio's patch on top of Stolee's, and I am
> equally fine with this patch series. My main aim is not so much
> future-proofing, though, as it is to avoid regressions in existing setups.
I'm fine either way. I think that Jonathan's patch comes from a
more informed place than my patches, so his are probably safer.
The situation that caught my interest is covered by this test
that was part of my patches:
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 7cd45fc1394..6c0b82c3930 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -68,6 +68,18 @@ test_expect_success 'git sparse-checkout init' '
check_files repo a
'
+test_expect_success 'git sparse-checkout works if repository format is wrong' '
+ test_when_finished git -C repo config core.repositoryFormatVersion 1 &&
+ git -C repo config --unset core.repositoryFormatVersion &&
+ git -C repo sparse-checkout init &&
+ git -C repo config core.repositoryFormatVersion >actual &&
+ echo 1 >expect &&
+ git -C repo config core.repositoryFormatVersion 0 &&
+ git -C repo sparse-checkout init &&
+ git -C repo config core.repositoryFormatVersion >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'git sparse-checkout list after init' '
git -C repo sparse-checkout list >actual &&
cat >expect <<-\EOF &&
and this test passes with Jonathan's series. I think this kind
of behavior is covered by his change to the 'converting to partial
clone fails with noop extension' test in t0410-partial-clone.sh,
so a duplicate test in t1091-sparse-checkout-builtin.sh may be
overkill.
Thanks, all.
-Stolee
prev parent reply other threads:[~2020-07-16 12:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 21:55 [PATCH] setup: warn about un-enabled extensions Johannes Schindelin via GitGitGadget
2020-07-13 22:48 ` Junio C Hamano
2020-07-14 0:24 ` Derrick Stolee
2020-07-14 12:21 ` Johannes Schindelin
2020-07-14 15:27 ` Junio C Hamano
2020-07-14 15:40 ` Derrick Stolee
2020-07-14 20:30 ` Johannes Schindelin
2020-07-14 20:47 ` Junio C Hamano
2020-07-15 16:09 ` Junio C Hamano
2020-07-15 17:01 ` Junio C Hamano
2020-07-15 18:00 ` Derrick Stolee
2020-07-15 18:09 ` Junio C Hamano
2020-07-15 18:40 ` Derrick Stolee
2020-07-15 19:16 ` Johannes Schindelin
2020-07-15 18:15 ` Junio C Hamano
2020-07-15 19:21 ` Johannes Schindelin
2020-07-15 18:20 ` Jonathan Nieder
2020-07-16 2:06 ` Junio C Hamano
2020-07-16 6:20 ` [PATCH 0/2] extensions.* fixes for 2.28 (Re: [PATCH] setup: warn about un-enabled extensions) Jonathan Nieder
2020-07-16 6:24 ` [PATCH 1/2] Revert "check_repository_format_gently(): refuse extensions for old repositories" Jonathan Nieder
2020-07-16 10:56 ` Jeff King
2020-07-16 6:28 ` [PATCH 2/2] repository: allow repository format upgrade with extensions Jonathan Nieder
2020-07-16 7:01 ` Junio C Hamano
2020-07-16 11:00 ` Jeff King
2020-07-16 12:25 ` Jeff King
2020-07-16 12:53 ` Derrick Stolee
2020-07-16 16:32 ` Junio C Hamano
2020-07-16 16:53 ` Jeff King
2020-07-16 20:27 ` Junio C Hamano
2020-07-16 16:49 ` Junio C Hamano
2020-07-16 16:56 ` Jeff King
2020-07-16 16:10 ` Junio C Hamano
2020-07-16 22:37 ` Jonathan Nieder
2020-07-16 23:50 ` Junio C Hamano
2020-07-17 15:27 ` Jeff King
2020-07-17 17:07 ` Junio C Hamano
2020-07-17 15:22 ` Jeff King
2020-07-16 8:13 ` [PATCH 0/2] extensions.* fixes for 2.28 (Re: [PATCH] setup: warn about un-enabled extensions) Johannes Schindelin
2020-07-16 12:17 ` Derrick Stolee [this message]
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=e32f27f4-6469-fe68-8263-bd10a101d380@gmail.com \
--to=stolee@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=delphij@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=huanhuanchen@google.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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).