diff options
Diffstat (limited to 't/t4002-diff-basic.sh')
| -rwxr-xr-x | t/t4002-diff-basic.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh index 2ec296118..769274aa5 100755 --- a/t/t4002-diff-basic.sh +++ b/t/t4002-diff-basic.sh @@ -171,28 +171,28 @@ test_expect_success \ test_expect_success \ 'diff-cache O with A in cache' \ 'git-read-tree $tree_A && - git-diff-cache --cached $tree_O >.test-a && + git-diff-index --cached $tree_O >.test-a && cmp -s .test-a .test-recursive-OA' test_expect_success \ 'diff-cache O with B in cache' \ 'git-read-tree $tree_B && - git-diff-cache --cached $tree_O >.test-a && + git-diff-index --cached $tree_O >.test-a && cmp -s .test-a .test-recursive-OB' test_expect_success \ 'diff-cache A with B in cache' \ 'git-read-tree $tree_B && - git-diff-cache --cached $tree_A >.test-a && + git-diff-index --cached $tree_A >.test-a && cmp -s .test-a .test-recursive-AB' test_expect_success \ 'diff-files with O in cache and A checked out' \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_A && - git-checkout-cache -f -a && + git-checkout-index -f -a && git-read-tree -m $tree_O || return 1 - git-update-cache --refresh >/dev/null ;# this can exit non-zero + git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-OA' @@ -200,9 +200,9 @@ test_expect_success \ 'diff-files with O in cache and B checked out' \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_B && - git-checkout-cache -f -a && + git-checkout-index -f -a && git-read-tree -m $tree_O || return 1 - git-update-cache --refresh >/dev/null ;# this can exit non-zero + git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-OB' @@ -210,9 +210,9 @@ test_expect_success \ 'diff-files with A in cache and B checked out' \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_B && - git-checkout-cache -f -a && + git-checkout-index -f -a && git-read-tree -m $tree_A || return 1 - git-update-cache --refresh >/dev/null ;# this can exit non-zero + git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-AB' |