Skip to content

t2021: move directory-to-file checkout test out of t0050 #2210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skdas20 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

t2021: move directory-to-file checkout test out of t0050 #2210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions t/t0050-filesystem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions t/t2021-checkout-overwrite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,27 @@ test_expect_success 'checkout --overwrite-ignore should succeed if only ignored
test_path_is_file some_dir
'

test_expect_success 'checkout switching to a tracked file replaces a tracked directory' '
git init -b main dir-to-file &&
(
cd dir-to-file &&

>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_path_is_file Gitweb &&
test_path_is_missing gitweb
)
'

test_done
Loading