Skip to content

[GSoC Patch] t2000: modernize path checks to use helper functions #2256

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
alibaba0010 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −46
Open

[GSoC Patch] t2000: modernize path checks to use helper functions #2256

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
55 changes: 9 additions & 46 deletions t/t2000-conflict-when-checking-files-out.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,59 +83,22 @@ test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '
# path path3 is occupied by a non-directory. With "-f" it should remove
# the symlink path3 and create directory path3 and file path3/file1.

test_expect_success 'prepare path2/file0 and index' '
test_expect_success 'checkout-index -f resolves symlink conflict on leading path' '
mkdir path2 &&
date >path2/file0 &&
git update-index --add path2/file0
'

test_expect_success 'write tree with path2/file0' '
tree1=$(git write-tree)
'

test_debug 'show_files $tree1'

test_expect_success 'prepare path3/file1 and index' '
git update-index --add path2/file0 &&
tree1=$(git write-tree) &&
mkdir path3 &&
date >path3/file1 &&
git update-index --add path3/file1
'

test_expect_success 'write tree with path3/file1' '
tree2=$(git write-tree)
'

test_debug 'show_files $tree2'

test_expect_success 'read previously written tree and checkout.' '
git update-index --add path3/file1 &&
tree2=$(git write-tree) &&
rm -fr path3 &&
git read-tree -m $tree1 &&
git checkout-index -f -a
'

test_debug 'show_files $tree1'

test_expect_success 'add a symlink' '
test_ln_s_add path2 path3
'

test_expect_success 'write tree with symlink path3' '
tree3=$(git write-tree)
'

test_debug 'show_files $tree3'

# Morten says "Got that?" here.
# Test begins.

test_expect_success 'read previously written tree and checkout.' '
git checkout-index -f -a &&
test_ln_s_add path2 path3 &&
tree3=$(git write-tree) &&
git read-tree $tree2 &&
git checkout-index -f -a
'

test_debug 'show_files $tree2'

test_expect_success 'checking out conflicting path with -f' '
git checkout-index -f -a &&
test_path_is_dir_not_symlink path2 &&
test_path_is_dir_not_symlink path3 &&
test_path_is_file_not_symlink path2/file0 &&
Expand Down
Loading