Re: [PATCH] t2018: move checkout case-insensitive test from t0050

[Junio C Hamano <gitster@pobox.com>]

"Md Ferdous Alam via GitGitGadget" <gitgitgadget@gmail.com> writes:

Adding CC the authors of 69f272b9 (dir: special case check for the
possibility that pathspec is NULL, 2019-10-01) and 06d53148 (t[01]*:
adjust the references to the default branch name "main", 2020-11-18)
the block of lines removed by this patch are blamed for.

One thing that I noticed that needs checking but I didn't do so
myself is that the original is prepared not to break after Git 3.0
by using 'main' in t0050 (which forces the initial branch name to be
'main').  Whereever the corresponding new code goes, there needs a
similar provision to prevent the test from getting broken with the
default change.

I think specifying the initial branch name explicitly when the test
creates "repo-case" test repository and use that to go back to that
branch would be better for the purpose of this single test, rather
than using the blanket "GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME" for
the entire script.


> From: mdferdousalam <mdferdousalam1989@yahoo.com>
>
> The test 'checkout with no pathspec and a case insensitive fs' in
> t0050 does not really belong there as it tests branch checkout
> behavior, not filesystem properties.  It also had an unnecessary
> CASE_INSENSITIVE_FS prereq since the sequence of commands should
> succeed on any filesystem, and it did not verify the resulting
> worktree contents.
>
> Move it to t2018-checkout-branch.sh where it belongs, drop the
> prereq, and add a check that the expected file is present after
> the checkout.
>
> Signed-off-by: mdferdousalam <mdferdousalam1989@yahoo.com>
> ---
>     t2018: move checkout case-insensitive test from t0050
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2054%2Fmdferdousalam%2Fmove-checkout-test-from-t0050-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2054/mdferdousalam/move-checkout-test-from-t0050-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/2054
>
>  t/t0050-filesystem.sh      | 20 --------------------
>  t/t2018-checkout-branch.sh | 21 +++++++++++++++++++++
>  2 files changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
> index ca8568067d..003329c082 100755
> --- a/t/t0050-filesystem.sh
> +++ b/t/t0050-filesystem.sh
> @@ -117,24 +117,4 @@ $test_unicode 'merge (silent unicode normalization)' '
>  	git merge topic
>  '
>  
> -test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case insensitive fs' '
> -	git init repo &&
> -	(
> -		cd repo &&
> -
> -		>Gitweb &&
> -		git add Gitweb &&
> -		git commit -m "add Gitweb" &&
> -
> -		git checkout --orphan todo &&
> -		git reset --hard &&
> -		mkdir -p gitweb/subdir &&
> -		>gitweb/subdir/file &&
> -		git add gitweb &&
> -		git commit -m "add gitweb/subdir/file" &&
> -
> -		git checkout main
> -	)
> -'
> -
>  test_done
> diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
> index a48ebdbf4d..5f37e40591 100755
> --- a/t/t2018-checkout-branch.sh
> +++ b/t/t2018-checkout-branch.sh
> @@ -285,4 +285,25 @@ test_expect_success 'checkout -b rejects an extra path argument' '
>  	test_grep "Cannot update paths and switch to branch" err
>  '
>  
> +test_expect_success 'checkout a branch when file and directory share case-insensitive name' '
> +	git init repo-case &&
> +	(
> +		cd repo-case &&
> +
> +		>Gitweb &&
> +		git add Gitweb &&
> +		git commit -m "add Gitweb" &&
> +
> +		git checkout --orphan other &&
> +		git reset --hard &&
> +		mkdir -p gitweb/subdir &&
> +		>gitweb/subdir/file &&
> +		git add gitweb &&
> +		git commit -m "add gitweb/subdir/file" &&
> +
> +		git checkout master &&
> +		test_path_is_file Gitweb
> +	)
> +'
> +
>  test_done
>
> base-commit: 7c02d39fc2ed2702223c7674f73150d9a7e61ba4