diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-07 17:26:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-07 17:45:20 -0700 |
| commit | 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 (patch) | |
| tree | 6bc7aa4f652d0ef49108d9e30a7ea7fbf8e44639 /t/t2000-checkout-cache-clash.sh | |
| parent | 99977bd5fdeabbd0608a70e9411c243007ec4ea2 (diff) | |
| download | git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.gz | |
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t2000-checkout-cache-clash.sh')
| -rwxr-xr-x | t/t2000-checkout-cache-clash.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t2000-checkout-cache-clash.sh b/t/t2000-checkout-cache-clash.sh index a2c42602da..03ea4dece4 100755 --- a/t/t2000-checkout-cache-clash.sh +++ b/t/t2000-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: @@ -16,7 +16,7 @@ And then tries to checkout in a work tree that has the following: path0/file0 - a file in a directory path1 - a file -The git-checkout-cache command should fail when attempting to checkout +The git-checkout-index command should fail when attempting to checkout path0, finding it is occupied by a directory, and path1/file1, finding path1 is occupied by a non-directory. With "-f" flag, it should remove the conflicting paths and succeed. @@ -28,8 +28,8 @@ mkdir path1 date >path1/file1 test_expect_success \ - 'git-update-cache --add various paths.' \ - 'git-update-cache --add path0 path1/file1' + 'git-update-index --add various paths.' \ + 'git-update-index --add path0 path1/file1' rm -fr path0 path1 mkdir path0 @@ -37,15 +37,15 @@ date >path0/file0 date >path1 test_expect_failure \ - 'git-checkout-cache without -f should fail on conflicting work tree.' \ - 'git-checkout-cache -a' + 'git-checkout-index without -f should fail on conflicting work tree.' \ + 'git-checkout-index -a' test_expect_success \ - 'git-checkout-cache with -f should succeed.' \ - 'git-checkout-cache -f -a' + 'git-checkout-index with -f should succeed.' \ + 'git-checkout-index -f -a' test_expect_success \ - 'git-checkout-cache conflicting paths.' \ + 'git-checkout-index conflicting paths.' \ 'test -f path0 && test -d path1 && test -f path1/file1' test_done |