You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
1.4 KiB
69 lines
1.4 KiB
#!/bin/sh |
|
|
|
test_description='checkout must not overwrite an untracked objects' |
|
|
|
TEST_PASSES_SANITIZE_LEAK=true |
|
. ./test-lib.sh |
|
|
|
test_expect_success 'setup' ' |
|
|
|
mkdir -p a/b/c && |
|
>a/b/c/d && |
|
git add -A && |
|
git commit -m base && |
|
git tag start |
|
' |
|
|
|
test_expect_success 'create a commit where dir a/b changed to file' ' |
|
|
|
git checkout -b file && |
|
rm -rf a/b && |
|
>a/b && |
|
git add -A && |
|
git commit -m "dir to file" |
|
' |
|
|
|
test_expect_success 'checkout commit with dir must not remove untracked a/b' ' |
|
|
|
git rm --cached a/b && |
|
git commit -m "un-track the file" && |
|
test_must_fail git checkout start && |
|
test -f a/b |
|
' |
|
|
|
test_expect_success 'create a commit where dir a/b changed to symlink' ' |
|
|
|
rm -rf a/b && # cleanup if previous test failed |
|
git checkout -f -b symlink start && |
|
rm -rf a/b && |
|
git add -A && |
|
test_ln_s_add foo a/b && |
|
git commit -m "dir to symlink" |
|
' |
|
|
|
test_expect_success 'checkout commit with dir must not remove untracked a/b' ' |
|
|
|
git rm --cached a/b && |
|
git commit -m "un-track the symlink" && |
|
test_must_fail git checkout start |
|
' |
|
|
|
test_expect_success SYMLINKS 'the symlink remained' ' |
|
|
|
test_when_finished "rm a/b" && |
|
test -h a/b |
|
' |
|
|
|
test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing entries' ' |
|
git checkout -f start && |
|
mkdir dir && |
|
>dir/f && |
|
git add dir/f && |
|
git commit -m "add dir/f" && |
|
mv dir untracked && |
|
ln -s untracked dir && |
|
git checkout -f HEAD~ && |
|
test_path_is_file untracked/f |
|
' |
|
|
|
test_done
|
|
|