b413a82712
When a directory exists but has only ignored files within it and we are trying to switch to a branch that has a file where that directory is, the behavior depends upon --[no]-overwrite-ignore. If the user wants to --overwrite-ignore (the default), then we should delete the ignored file and directory and switch to the new branch. The code to handle this in verify_clean_subdirectory() in unpack-trees tried to handle this via paying attention to the exclude_per_dir setting of the internal dir field. This came from commitc81935348b("Fix switching to a branch with D/F when current branch has file D.", 2007-03-15), which pre-dated039bc64e88("core.excludesfile clean-up", 2007-11-14), and thus did not pay attention to ignore patterns from other relevant files. Change it to use setup_standard_excludes() so that it is also aware of excludes specified in other locations. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
84 lines
1.8 KiB
Bash
Executable File
84 lines
1.8 KiB
Bash
Executable File
#!/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 -h a/b
|
|
'
|
|
|
|
test_expect_success 'cleanup after previous symlink tests' '
|
|
rm 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_expect_success 'checkout --overwrite-ignore should succeed if only ignored files in the way' '
|
|
git checkout -b df_conflict &&
|
|
test_commit contents some_dir &&
|
|
git checkout start &&
|
|
mkdir some_dir &&
|
|
echo autogenerated information >some_dir/ignore &&
|
|
echo ignore >.git/info/exclude &&
|
|
git checkout --overwrite-ignore df_conflict &&
|
|
! test_path_is_dir some_dir
|
|
'
|
|
|
|
test_done
|