X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft2001-checkout-cache-clash.sh;h=0dcab8f1dea0d3d5e4bcebbc0b571fe46c2265e0;hb=45f75a0167b4a4693f2c6005bf7db231ca91ecc8;hp=f0e3d1d8c34be7673210f38d7bd8a63d66fff44e;hpb=f50c9f76ca516051e9f7e7ef68d6a4d0f5830dda;p=git.git diff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh index f0e3d1d8..0dcab8f1 100755 --- a/t/t2001-checkout-cache-clash.sh +++ b/t/t2001-checkout-cache-clash.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-checkout-cache test. +test_description='git-checkout-index test. This test registers the following filesystem structure in the cache: @@ -36,8 +36,8 @@ show_files() { mkdir path0 date >path0/file0 test_expect_success \ - 'git-update-cache --add path0/file0' \ - 'git-update-cache --add path0/file0' + 'git-update-index --add path0/file0' \ + 'git-update-index --add path0/file0' test_expect_success \ 'writing tree out with git-write-tree' \ 'tree1=$(git-write-tree)' @@ -46,8 +46,8 @@ test_debug 'show_files $tree1' mkdir path1 date >path1/file1 test_expect_success \ - 'git-update-cache --add path1/file1' \ - 'git-update-cache --add path1/file1' + 'git-update-index --add path1/file1' \ + 'git-update-index --add path1/file1' test_expect_success \ 'writing tree out with git-write-tree' \ 'tree2=$(git-write-tree)' @@ -56,13 +56,13 @@ test_debug 'show_files $tree2' rm -fr path1 test_expect_success \ 'read previously written tree and checkout.' \ - 'git-read-tree -m $tree1 && git-checkout-cache -f -a' + 'git-read-tree -m $tree1 && git-checkout-index -f -a' test_debug 'show_files $tree1' ln -s path0 path1 test_expect_success \ - 'git-update-cache --add a symlink.' \ - 'git-update-cache --add path1' + 'git-update-index --add a symlink.' \ + 'git-update-index --add path1' test_expect_success \ 'writing tree out with git-write-tree' \ 'tree3=$(git-write-tree)' @@ -73,8 +73,8 @@ test_debug 'show_files $tree3' test_expect_success \ 'read previously written tree and checkout.' \ - 'git-read-tree $tree2 && git-checkout-cache -f -a' -test_debug show_files $tree2 + 'git-read-tree $tree2 && git-checkout-index -f -a' +test_debug 'show_files $tree2' test_expect_success \ 'checking out conflicting path with -f' \