Re: [PATCH] setup: tweak upgrade policy to grandfather worktreeconfig
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 13, 2020, 21:45 UTC
- Message-ID
- <xmqqlfjnm6ll.fsf@gitster.c.googlers.com>
- In-Reply-To
- <b8ae18f7-a0af-bd62-2553-92989e1dbe7e@gmail.com>
Derrick Stolee <stolee@gmail.com> writes:
Show 27 quoted lines
> I also like that you are actually fixing the case where a user in > the bad state _can_ get out using "git sparse-checkout init". > > This can be verified by adding this test: > > 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 sparse-checkout init && > git -C repo config core.repositoryFormatVersion >actual && > echo 1 >expect && > test_cmp expect actual && > git -C repo config core.repositoryFormatVersion 0 && > git -C repo sparse-checkout init && > git -C repo config core.repositoryFormatVersion >actual && > test_cmp expect actual > ' > >> Signed-off-by: Junio C Hamano <gitster@pobox.com> >> --- >> >> * This time with a log message to explain and justify the change, >> with a matching tweak to the test script, designed to be applied >> on top, but feel free to squash it in if you agree with me that >> we do not need two separate commits for this. > > Since this commit removes all evidence of the previous one, I would > recommend just squashing them together.
Alright, then care to do the honors ;-)? Let's make sure we have it in -rc1 to avoid nasty "regression" in the upcoming release.
Thanks for raising the issue and exploring the solution space.