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 | |
| parent | 99977bd5fdeabbd0608a70e9411c243007ec4ea2 (diff) | |
| download | git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.gz git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.xz | |
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')
36 files changed, 321 insertions, 321 deletions
@@ -20,9 +20,9 @@ the tests. *** t0000-basic.sh *** * ok 1: .git/objects should be empty after git-init-db in an empty repo. * ok 2: .git/objects should have 256 subdirectories. - * ok 3: git-update-cache without --add should fail adding. + * ok 3: git-update-index without --add should fail adding. ... - * ok 23: no diff after checkout and git-update-cache --refresh. + * ok 23: no diff after checkout and git-update-index --refresh. * passed all 23 test(s) *** t0100-environment-names.sh *** * ok 1: using old names should issue warnings. @@ -33,7 +33,7 @@ Or you can run each test individually from command line, like this: $ sh ./t3001-ls-files-killed.sh - * ok 1: git-update-cache --add to add various paths. + * ok 1: git-update-index --add to add various paths. * ok 2: git-ls-files -k to show killed files. * ok 3: validate git-ls-files -k output. * passed all 3 test(s) @@ -163,8 +163,8 @@ library for your script to use. Example: test_expect_failure \ - 'git-update-cache without --add should fail adding.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --add should fail adding.' \ + 'git-update-index should-be-empty' - test_debug <script> diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh index d6645b4f4..d195603df 100755 --- a/t/lib-read-tree-m-3way.sh +++ b/t/lib-read-tree-m-3way.sh @@ -10,14 +10,14 @@ do echo This is Z/$p from the original tree. >Z/$p test_expect_success \ "adding test file $p and Z/$p" \ - 'git-update-cache --add $p && - git-update-cache --add Z/$p' + 'git-update-index --add $p && + git-update-index --add Z/$p' done done echo This is SS from the original tree. >SS test_expect_success \ 'adding test file SS' \ - 'git-update-cache --add SS' + 'git-update-index --add SS' cat >TT <<\EOF This is a trivial merge sample text. Branch A is expected to upcase this word, here. @@ -32,7 +32,7 @@ This concludes the trivial merge sample file. EOF test_expect_success \ 'adding test file TT' \ - 'git-update-cache --add TT' + 'git-update-index --add TT' test_expect_success \ 'prepare initial tree' \ 'tree_O=$(git-write-tree)' @@ -47,14 +47,14 @@ to_remove=$(echo D? Z/D?) rm -f $to_remove test_expect_success \ 'change in branch A (removal)' \ - 'git-update-cache --remove $to_remove' + 'git-update-index --remove $to_remove' for p in M? Z/M? do echo This is modified $p in the branch A. >$p test_expect_success \ 'change in branch A (modification)' \ - "git-update-cache $p" + "git-update-index $p" done for p in AN AA Z/AN Z/AA @@ -62,27 +62,27 @@ do echo This is added $p in the branch A. >$p test_expect_success \ 'change in branch A (addition)' \ - "git-update-cache --add $p" + "git-update-index --add $p" done echo This is SS from the modified tree. >SS echo This is LL from the modified tree. >LL test_expect_success \ 'change in branch A (addition)' \ - 'git-update-cache --add LL && - git-update-cache SS' + 'git-update-index --add LL && + git-update-index SS' mv TT TT- sed -e '/Branch A/s/word/WORD/g' <TT- >TT rm -f TT- test_expect_success \ 'change in branch A (edit)' \ - 'git-update-cache TT' + 'git-update-index TT' mkdir DF echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF test_expect_success \ 'change in branch A (change file to directory)' \ - 'git-update-cache --add DF/DF' + 'git-update-index --add DF/DF' test_expect_success \ 'recording branch A tree' \ @@ -97,20 +97,20 @@ mkdir Z test_expect_success \ 'reading original tree and checking out' \ 'git-read-tree $tree_O && - git-checkout-cache -a' + git-checkout-index -a' to_remove=$(echo ?D Z/?D) rm -f $to_remove test_expect_success \ 'change in branch B (removal)' \ - "git-update-cache --remove $to_remove" + "git-update-index --remove $to_remove" for p in ?M Z/?M do echo This is modified $p in the branch B. >$p test_expect_success \ 'change in branch B (modification)' \ - "git-update-cache $p" + "git-update-index $p" done for p in NA AA Z/NA Z/AA @@ -118,25 +118,25 @@ do echo This is added $p in the branch B. >$p test_expect_success \ 'change in branch B (addition)' \ - "git-update-cache --add $p" + "git-update-index --add $p" done echo This is SS from the modified tree. >SS echo This is LL from the modified tree. >LL test_expect_success \ 'change in branch B (addition and modification)' \ - 'git-update-cache --add LL && - git-update-cache SS' + 'git-update-index --add LL && + git-update-index SS' mv TT TT- sed -e '/Branch B/s/word/WORD/g' <TT- >TT rm -f TT- test_expect_success \ 'change in branch B (modification)' \ - 'git-update-cache TT' + 'git-update-index TT' echo Branch B makes a file at DF. >DF test_expect_success \ 'change in branch B (addition of a file to conflict with directory)' \ - 'git-update-cache --add DF' + 'git-update-index --add DF' test_expect_success \ 'recording branch B tree' \ @@ -147,12 +147,12 @@ test_expect_success \ 'rm -f .git/index && git-read-tree $tree_O && mkdir .orig-O && - git-checkout-cache --prefix=.orig-O/ -f -q -a && + git-checkout-index --prefix=.orig-O/ -f -q -a && rm -f .git/index && git-read-tree $tree_A && mkdir .orig-A && - git-checkout-cache --prefix=.orig-A/ -f -q -a && + git-checkout-index --prefix=.orig-A/ -f -q -a && rm -f .git/index && git-read-tree $tree_B && mkdir .orig-B && - git-checkout-cache --prefix=.orig-B/ -f -q -a' + git-checkout-index --prefix=.orig-B/ -f -q -a' diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 142b7bf38..3649f0f74 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -40,13 +40,13 @@ test_expect_success \ # updating a new file without --add should fail. test_expect_failure \ - 'git-update-cache without --add should fail adding.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --add should fail adding.' \ + 'git-update-index should-be-empty' # and with --add it should succeed, even if it is empty (it used to fail). test_expect_success \ - 'git-update-cache with --add should succeed.' \ - 'git-update-cache --add should-be-empty' + 'git-update-index with --add should succeed.' \ + 'git-update-index --add should-be-empty' test_expect_success \ 'writing tree out with git-write-tree' \ @@ -60,12 +60,12 @@ test_expect_success \ # Removing paths. rm -f should-be-empty full-of-directories test_expect_failure \ - 'git-update-cache without --remove should fail removing.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --remove should fail removing.' \ + 'git-update-index should-be-empty' test_expect_success \ - 'git-update-cache with --remove should be able to remove.' \ - 'git-update-cache --remove should-be-empty' + 'git-update-index with --remove should be able to remove.' \ + 'git-update-index --remove should-be-empty' # Empty tree can be written with recent write-tree. test_expect_success \ @@ -84,8 +84,8 @@ do ln -s "hello $p" ${p}sym done test_expect_success \ - 'adding various types of objects with git-update-cache --add.' \ - 'find path* ! -type d -print0 | xargs -0 git-update-cache --add' + 'adding various types of objects with git-update-index --add.' \ + 'find path* ! -type d -print0 | xargs -0 git-update-index --add' # Show them and see that matches what we expect. test_expect_success \ @@ -170,11 +170,11 @@ test_expect_success \ 'git-diff-files >current && diff >/dev/null -b current expected' test_expect_success \ - 'git-update-cache --refresh should succeed.' \ - 'git-update-cache --refresh' + 'git-update-index --refresh should succeed.' \ + 'git-update-index --refresh' test_expect_success \ - 'no diff after checkout and git-update-cache --refresh.' \ + 'no diff after checkout and git-update-index --refresh.' \ 'git-diff-files >current && cmp -s current /dev/null' test_done diff --git a/t/t0100-environment-names.sh b/t/t0100-environment-names.sh index 9f851bc11..3493bd4de 100755 --- a/t/t0100-environment-names.sh +++ b/t/t0100-environment-names.sh @@ -34,7 +34,7 @@ export_them () { } date >path0 -git-update-cache --add path0 +git-update-index --add path0 tree=$(git-write-tree) AUTHOR_DATE='Wed May 11 23:55:18 2005' diff --git a/t/t0110-environment-names-old.sh b/t/t0110-environment-names-old.sh index c548b9b49..5d602cc21 100755 --- a/t/t0110-environment-names-old.sh +++ b/t/t0110-environment-names-old.sh @@ -54,8 +54,8 @@ test_expect_success \ date >path0 test_expect_success \ - 'using GIT_DIR in git-update-cache' \ - 'git-update-cache --add path0 && test -f .svn/index' + 'using GIT_DIR in git-update-index' \ + 'git-update-index --add path0 && test -f .svn/index' sedScript='s|\(..\)|.svn/objects/\1/|' diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh index 89f0e81f2..f1cd50cee 100755 --- a/t/t1000-read-tree-m-3way.sh +++ b/t/t1000-read-tree-m-3way.sh @@ -150,7 +150,7 @@ test_expect_success \ "rm -fr [NDMALTS][NDMALTSF] Z && rm .git/index && git-read-tree $tree_A && - git-checkout-cache -f -u -a && + git-checkout-index -f -u -a && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -230,21 +230,21 @@ test_expect_failure \ '1 - must not have an entry not in A.' \ "rm -f .git/index XX && echo XX >XX && - git-update-cache --add XX && + git-update-index --add XX && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '2 - must match B in !O && !A && B case.' \ "rm -f .git/index NA && cp .orig-B/NA NA && - git-update-cache --add NA && + git-update-index --add NA && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '2 - matching B alone is OK in !O && !A && B case.' \ "rm -f .git/index NA && cp .orig-B/NA NA && - git-update-cache --add NA && + git-update-index --add NA && echo extra >>NA && git-read-tree -m $tree_O $tree_A $tree_B" @@ -252,7 +252,7 @@ test_expect_success \ '3 - must match A in !O && A && !B case.' \ "rm -f .git/index AN && cp .orig-A/AN AN && - git-update-cache --add AN && + git-update-index --add AN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -260,7 +260,7 @@ test_expect_success \ '3 - matching A alone is OK in !O && A && !B case.' \ "rm -f .git/index AN && cp .orig-A/AN AN && - git-update-cache --add AN && + git-update-index --add AN && echo extra >>AN && git-read-tree -m $tree_O $tree_A $tree_B" @@ -269,14 +269,14 @@ test_expect_failure \ "rm -f .git/index AN && cp .orig-A/AN AN && echo extra >>AN && - git-update-cache --add AN && + git-update-index --add AN && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '4 - must match and be up-to-date in !O && A && B && A!=B case.' \ "rm -f .git/index AA && cp .orig-A/AA AA && - git-update-cache --add AA && + git-update-index --add AA && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -284,7 +284,7 @@ test_expect_failure \ '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.' \ "rm -f .git/index AA && cp .orig-A/AA AA && - git-update-cache --add AA && + git-update-index --add AA && echo extra >>AA && git-read-tree -m $tree_O $tree_A $tree_B" @@ -293,14 +293,14 @@ test_expect_failure \ "rm -f .git/index AA && cp .orig-A/AA AA && echo extra >>AA && - git-update-cache --add AA && + git-update-index --add AA && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '5 - must match in !O && A && B && A==B case.' \ "rm -f .git/index LL && cp .orig-A/LL LL && - git-update-cache --add LL && + git-update-index --add LL && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -308,7 +308,7 @@ test_expect_success \ '5 - must match in !O && A && B && A==B case.' \ "rm -f .git/index LL && cp .orig-A/LL LL && - git-update-cache --add LL && + git-update-index --add LL && echo extra >>LL && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -318,35 +318,35 @@ test_expect_failure \ "rm -f .git/index LL && cp .orig-A/LL LL && echo extra >>LL && - git-update-cache --add LL && + git-update-index --add LL && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '6 - must not exist in O && !A && !B case' \ "rm -f .git/index DD && echo DD >DD - git-update-cache --add DD && + git-update-index --add DD && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '7 - must not exist in O && !A && B && O!=B case' \ "rm -f .git/index DM && cp .orig-B/DM DM && - git-update-cache --add DM && + git-update-index --add DM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '8 - must not exist in O && !A && B && O==B case' \ "rm -f .git/index DN && cp .orig-B/DN DN && - git-update-cache --add DN && + git-update-index --add DN && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '9 - must match and be up-to-date in O && A && !B && O!=A case' \ "rm -f .git/index MD && cp .orig-A/MD MD && - git-update-cache --add MD && + git-update-index --add MD && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -354,7 +354,7 @@ test_expect_failure \ '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case' \ "rm -f .git/index MD && cp .orig-A/MD MD && - git-update-cache --add MD && + git-update-index --add MD && echo extra >>MD && git-read-tree -m $tree_O $tree_A $tree_B" @@ -363,14 +363,14 @@ test_expect_failure \ "rm -f .git/index MD && cp .orig-A/MD MD && echo extra >>MD && - git-update-cache --add MD && + git-update-index --add MD && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '10 - must match and be up-to-date in O && A && !B && O==A case' \ "rm -f .git/index ND && cp .orig-A/ND ND && - git-update-cache --add ND && + git-update-index --add ND && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -378,7 +378,7 @@ test_expect_failure \ '10 (fail) - must match and be up-to-date in O && A && !B && O==A case' \ "rm -f .git/index ND && cp .orig-A/ND ND && - git-update-cache --add ND && + git-update-index --add ND && echo extra >>ND && git-read-tree -m $tree_O $tree_A $tree_B" @@ -387,14 +387,14 @@ test_expect_failure \ "rm -f .git/index ND && cp .orig-A/ND ND && echo extra >>ND && - git-update-cache --add ND && + git-update-index --add ND && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case' \ "rm -f .git/index MM && cp .orig-A/MM MM && - git-update-cache --add MM && + git-update-index --add MM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -402,7 +402,7 @@ test_expect_failure \ '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case' \ "rm -f .git/index MM && cp .orig-A/MM MM && - git-update-cache --add MM && + git-update-index --add MM && echo extra >>MM && git-read-tree -m $tree_O $tree_A $tree_B" @@ -411,14 +411,14 @@ test_expect_failure \ "rm -f .git/index MM && cp .orig-A/MM MM && echo extra >>MM && - git-update-cache --add MM && + git-update-index --add MM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '12 - must match A in O && A && B && O!=A && A==B case' \ "rm -f .git/index SS && cp .orig-A/SS SS && - git-update-cache --add SS && + git-update-index --add SS && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -426,7 +426,7 @@ test_expect_success \ '12 - must match A in O && A && B && O!=A && A==B case' \ "rm -f .git/index SS && cp .orig-A/SS SS && - git-update-cache --add SS && + git-update-index --add SS && echo extra >>SS && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -436,14 +436,14 @@ test_expect_failure \ "rm -f .git/index SS && cp .orig-A/SS SS && echo extra >>SS && - git-update-cache --add SS && + git-update-index --add SS && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '13 - must match A in O && A && B && O!=A && O==B case' \ "rm -f .git/index MN && cp .orig-A/MN MN && - git-update-cache --add MN && + git-update-index --add MN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -451,7 +451,7 @@ test_expect_success \ '13 - must match A in O && A && B && O!=A && O==B case' \ "rm -f .git/index MN && cp .orig-A/MN MN && - git-update-cache --add MN && + git-update-index --add MN && echo extra >>MN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -460,7 +460,7 @@ test_expect_success \ '14 - must match and be up-to-date in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-A/NM NM && - git-update-cache --add NM && + git-update-index --add NM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -468,7 +468,7 @@ test_expect_success \ '14 - may match B in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-B/NM NM && - git-update-cache --add NM && + git-update-index --add NM && echo extra >>NM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -477,7 +477,7 @@ test_expect_failure \ '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-A/NM NM && - git-update-cache --add NM && + git-update-index --add NM && echo extra >>NM && git-read-tree -m $tree_O $tree_A $tree_B" @@ -486,14 +486,14 @@ test_expect_failure \ "rm -f .git/index NM && cp .orig-A/NM NM && echo extra >>NM && - git-update-cache --add NM && + git-update-index --add NM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '15 - must match A in O && A && B && O==A && O==B case' \ "rm -f .git/index NN && cp .orig-A/NN NN && - git-update-cache --add NN && + git-update-index --add NN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -501,7 +501,7 @@ test_expect_success \ '15 - must match A in O && A && B && O==A && O==B case' \ "rm -f .git/index NN && cp .orig-A/NN NN && - git-update-cache --add NN && + git-update-index --add NN && echo extra >>NN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -511,7 +511,7 @@ test_expect_failure \ "rm -f .git/index NN && cp .orig-A/NN NN && echo extra >>NN && - git-update-cache --add NN && + git-update-index --add NN && git-read-tree -m $tree_O $tree_A $tree_B" test_done diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 919f2b310..5b69681c5 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -68,13 +68,13 @@ test_expect_success \ cat bozbar-old >bozbar && echo rezrov >rezrov && echo yomin >yomin && - git-update-cache --add nitfol bozbar rezrov && + git-update-index --add nitfol bozbar rezrov && treeH=`git-write-tree` && echo treeH $treeH && git-ls-tree $treeH && cat bozbar-new >bozbar && - git-update-cache --add frotz bozbar --force-remove rezrov && + git-update-index --add frotz bozbar --force-remove rezrov && git-ls-files --stage >M.out && treeM=`git-write-tree` && echo treeM $treeM && @@ -97,8 +97,8 @@ test_expect_success \ '4 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add yomin && + git-checkout-index -u -f -q -a && + git-update-index --add yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >4.out || return 1 diff -u M.out 4.out >4diff.out @@ -109,9 +109,9 @@ test_expect_success \ '5 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo yomin >yomin && - git-update-cache --add yomin && + git-update-index --add yomin && echo yomin yomin >yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >5.out || return 1 @@ -123,8 +123,8 @@ test_expect_success \ '6 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add frotz && + git-checkout-index -u -f -q -a && + git-update-index --add frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >6.out && diff -u M.out 6.out && @@ -134,9 +134,9 @@ test_expect_success \ '7 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz frotz >frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >7.out && @@ -147,18 +147,18 @@ test_expect_success \ '8 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '9 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz >frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -166,9 +166,9 @@ test_expect_success \ '10 - path removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && read_tree_twoway $treeH $treeM && git-ls-files --stage >10.out && diff -u M.out 10.out' @@ -177,9 +177,9 @@ test_expect_success \ '11 - dirty path removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -187,18 +187,18 @@ test_expect_success \ '12 - unmatching local changes being removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '13 - unmatching local changes being removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -211,9 +211,9 @@ test_expect_success \ '14 - unchanged in two heads.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && read_tree_twoway $treeH $treeM && git-ls-files --stage >14.out || return 1 diff -u M.out 14.out >14diff.out @@ -224,9 +224,9 @@ test_expect_success \ '15 - unchanged in two heads.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && echo nitfol nitfol nitfol >nitfol && read_tree_twoway $treeH $treeM && git-ls-files --stage >15.out || return 1 @@ -238,18 +238,18 @@ test_expect_success \ '16 - conflicting local change.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '17 - conflicting local change.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo bozbar bozbar bozbar >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -257,9 +257,9 @@ test_expect_success \ '18 - local change already having a good result.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-new >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >18.out && diff -u M.out 18.out && @@ -269,9 +269,9 @@ test_expect_success \ '19 - local change already having a good result, further modified.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-new >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >19.out && @@ -282,9 +282,9 @@ test_expect_success \ '20 - no local change, use new tree.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >20.out && diff -u M.out 20.out && @@ -294,9 +294,9 @@ test_expect_success \ '21 - no local change, dirty cache.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -305,9 +305,9 @@ test_expect_success \ '22 - local change cache updated.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && sed -e "s/such as/SUCH AS/" bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' # Also make sure we did not break DF vs DF/DF case. @@ -315,7 +315,7 @@ test_expect_success \ 'DF vs DF/DF case setup.' \ 'rm -f .git/index && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && treeDF=`git-write-tree` && echo treeDF $treeDF && git-ls-tree $treeDF && @@ -323,7 +323,7 @@ test_expect_success \ rm -f DF && mkdir DF && echo DF/DF >DF/DF && - git-update-cache --add --remove DF DF/DF && + git-update-index --add --remove DF DF/DF && treeDFDF=`git-write-tree` && echo treeDFDF $treeDFDF && git-ls-tree $treeDFDF && @@ -334,7 +334,7 @@ test_expect_success \ 'rm -f .git/index && rm -fr DF && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && read_tree_twoway $treeDF $treeDFDF && git-ls-files --stage >DFDFcheck.out && diff -u DFDF.out DFDFcheck.out && diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index 512d8977a..861ef4c0c 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -40,13 +40,13 @@ test_expect_success \ echo bozbar >bozbar && echo rezrov >rezrov && echo yomin >yomin && - git-update-cache --add nitfol bozbar rezrov && + git-update-index --add nitfol bozbar rezrov && treeH=`git-write-tree` && echo treeH $treeH && git-ls-tree $treeH && echo gnusto >bozbar && - git-update-cache --add frotz bozbar --force-remove rezrov && + git-update-index --add frotz bozbar --force-remove rezrov && git-ls-files --stage >M.out && treeM=`git-write-tree` && echo treeM $treeM && @@ -71,7 +71,7 @@ echo '+100644 X 0 yomin' >expected test_expect_success \ '4 - carry forward local addition.' \ 'rm -f .git/index && - git-update-cache --add yomin && + git-update-index --add yomin && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >4.out || return 1 diff --unified=0 M.out 4.out >4diff.out @@ -87,7 +87,7 @@ test_expect_success \ '5 - carry forward local addition.' \ 'rm -f .git/index && echo yomin >yomin && - git-update-cache --add yomin && + git-update-index --add yomin && echo yomin yomin >yomin && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >5.out || return 1 @@ -104,7 +104,7 @@ test_expect_success \ test_expect_success \ '6 - local addition already has the same.' \ 'rm -f .git/index && - git-update-cache --add frotz && + git-update-index --add frotz && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >6.out && diff --unified=0 M.out 6.out && @@ -119,7 +119,7 @@ test_expect_success \ '7 - local addition already has the same.' \ 'rm -f .git/index && echo frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz frotz >frotz && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >7.out && @@ -136,14 +136,14 @@ test_expect_success \ '8 - conflicting addition.' \ 'rm -f .git/index && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' test_expect_success \ '9 - conflicting addition.' \ 'rm -f .git/index && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz >frotz && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' @@ -151,7 +151,7 @@ test_expect_success \ '10 - path removed.' \ 'rm -f .git/index && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >10.out && cmp M.out 10.out && @@ -162,7 +162,7 @@ test_expect_success \ '11 - dirty path removed.' \ 'rm -f .git/index && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov rezrov >rezrov && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' @@ -170,14 +170,14 @@ test_expect_success \ '12 - unmatching local changes being removed.' \ 'rm -f .git/index && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' test_expect_success \ '13 - unmatching local changes being removed.' \ 'rm -f .git/index && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov >rezrov && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' @@ -190,7 +190,7 @@ test_expect_success \ '14 - unchanged in two heads.' \ 'rm -f .git/index && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >14.out || return 1 diff --unified=0 M.out 14.out >14diff.out @@ -209,7 +209,7 @@ test_expect_success \ '15 - unchanged in two heads.' \ 'rm -f .git/index && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && echo nitfol nitfol nitfol >nitfol && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >15.out || return 1 @@ -229,14 +229,14 @@ test_expect_success \ '16 - conflicting local change.' \ 'rm -f .git/index && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' test_expect_success \ '17 - conflicting local change.' \ 'rm -f .git/index && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo bozbar bozbar bozbar >bozbar && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' @@ -244,7 +244,7 @@ test_expect_success \ '18 - local change already having a good result.' \ 'rm -f .git/index && echo gnusto >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >18.out && diff --unified=0 M.out 18.out && @@ -256,7 +256,7 @@ test_expect_success \ '19 - local change already having a good result, further modified.' \ 'rm -f .git/index && echo gnusto >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >19.out && @@ -275,7 +275,7 @@ test_expect_success \ '20 - no local change, use new tree.' \ 'rm -f .git/index && echo bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && git-read-tree -m -u $treeH $treeM && git-ls-files --stage >20.out && diff --unified=0 M.out 20.out && @@ -287,7 +287,7 @@ test_expect_success \ '21 - no local change, dirty cache.' \ 'rm -f .git/index && echo bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && if git-read-tree -m -u $treeH $treeM; then false; else :; fi' @@ -296,7 +296,7 @@ test_expect_success \ 'DF vs DF/DF case setup.' \ 'rm -f .git/index && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && treeDF=`git-write-tree` && echo treeDF $treeDF && git-ls-tree $treeDF && @@ -304,7 +304,7 @@ test_expect_success \ rm -f DF && mkdir DF && echo DF/DF >DF/DF && - git-update-cache --add --remove DF DF/DF && + git-update-index --add --remove DF DF/DF && treeDFDF=`git-write-tree` && echo treeDFDF $treeDFDF && git-ls-tree $treeDFDF && @@ -315,7 +315,7 @@ test_expect_success \ 'rm -f .git/index && rm -fr DF && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && git-read-tree -m -u $treeDF $treeDFDF && git-ls-files --stage >DFDFcheck.out && diff --unified=0 DFDF.out DFDFcheck.out && diff --git a/t/t1005-read-tree-m-2way-emu23.sh b/t/t1005-read-tree-m-2way-emu23.sh index 9227254fc..00c332a14 100755 --- a/t/t1005-read-tree-m-2way-emu23.sh +++ b/t/t1005-read-tree-m-2way-emu23.sh @@ -25,7 +25,7 @@ In the test, these paths are used: read_tree_twoway () { git-read-tree --emu23 "$1" "$2" && git-ls-files --stage && - git-merge-cache git-merge-one-file-script -a && + git-merge-index ../../git-merge-one-file.sh -a && git-ls-files --stage } @@ -77,13 +77,13 @@ test_expect_success \ cat bozbar-old >bozbar && echo rezrov >rezrov && echo yomin >yomin && - git-update-cache --add nitfol bozbar rezrov && + git-update-index --add nitfol bozbar rezrov && treeH=`git-write-tree` && echo treeH $treeH && git-ls-tree $treeH && cat bozbar-new >bozbar && - git-update-cache --add frotz bozbar --force-remove rezrov && + git-update-index --add frotz bozbar --force-remove rezrov && git-ls-files --stage >M.out && treeM=`git-write-tree` && echo treeM $treeM && @@ -117,8 +117,8 @@ test_expect_success \ '4 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add yomin && + git-checkout-index -u -f -q -a && + git-update-index --add yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >4.out || return 1 diff -u M.out 4.out >4diff.out @@ -131,9 +131,9 @@ test_expect_success \ '5 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo yomin >yomin && - git-update-cache --add yomin && + git-update-index --add yomin && echo yomin yomin >yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >5.out || return 1 @@ -147,8 +147,8 @@ test_expect_success \ '6 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add frotz && + git-checkout-index -u -f -q -a && + git-update-index --add frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >6.out && diff -u M.out 6.out && @@ -160,9 +160,9 @@ test_expect_success \ '7 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz frotz >frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >7.out && @@ -173,18 +173,18 @@ test_expect_success \ '8 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '9 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz >frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -192,9 +192,9 @@ test_expect_success \ '10 - path removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && read_tree_twoway $treeH $treeM && git-ls-files --stage >10.out && diff -u M.out 10.out' @@ -203,9 +203,9 @@ test_expect_success \ '11 - dirty path removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -213,18 +213,18 @@ test_expect_success \ '12 - unmatching local changes being removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '13 - unmatching local changes being removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && echo rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -237,9 +237,9 @@ test_expect_success \ '14 - unchanged in two heads.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && read_tree_twoway $treeH $treeM && git-ls-files --stage >14.out || return 1 diff -u M.out 14.out >14diff.out @@ -250,9 +250,9 @@ test_expect_success \ '15 - unchanged in two heads.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo nitfol nitfol >nitfol && - git-update-cache --add nitfol && + git-update-index --add nitfol && echo nitfol nitfol nitfol >nitfol && read_tree_twoway $treeH $treeM && git-ls-files --stage >15.out || return 1 @@ -268,9 +268,9 @@ test_expect_success \ '16 - conflicting local change.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && git-read-tree --emu23 $treeH $treeM && check_stages' <<\EOF 100644 X 1 bozbar @@ -286,9 +286,9 @@ test_expect_success \ '17 - conflicting local change.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo bozbar bozbar >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo bozbar bozbar bozbar >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -296,9 +296,9 @@ test_expect_success \ '18 - local change already having a good result.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-new >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >18.out && diff -u M.out 18.out && @@ -308,9 +308,9 @@ test_expect_success \ '19 - local change already having a good result, further modified.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-new >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >19.out && @@ -321,9 +321,9 @@ test_expect_success \ '20 - no local change, use new tree.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >20.out && diff -u M.out 20.out && @@ -333,9 +333,9 @@ test_expect_success \ '21 - no local change, dirty cache.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && cat bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && echo gnusto gnusto >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -348,9 +348,9 @@ test_expect_success \ '22 - local change cache updated.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && sed -e "s/such as/SUCH AS/" bozbar-old >bozbar && - git-update-cache --add bozbar && + git-update-index --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >22.out || return 1 diff -u M.out 22.out >22diff.out @@ -362,7 +362,7 @@ test_expect_success \ 'DF vs DF/DF case setup.' \ 'rm -f .git/index && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && treeDF=`git-write-tree` && echo treeDF $treeDF && git-ls-tree $treeDF && @@ -371,7 +371,7 @@ test_expect_success \ rm -f DF && mkdir DF && echo DF/DF >DF/DF && - git-update-cache --add --remove DF DF/DF && + git-update-index --add --remove DF DF/DF && treeDFDF=`git-write-tree` && echo treeDFDF $treeDFDF && git-ls-tree $treeDFDF && @@ -382,7 +382,7 @@ test_expect_success \ 'rm -f .git/index && rm -fr DF && echo DF >DF && - git-update-cache --add DF && + git-update-index --add DF && read_tree_twoway $treeDF $treeDFDF && git-ls-files --stage >DFDFcheck.out && diff -u DFDF.out DFDFcheck.out && @@ -396,7 +396,7 @@ test_expect_success \ rm -fr DF && mkdir DF && echo DF/DF >DF/DF && - git-update-cache --add DF/DF && + git-update-index --add DF/DF && read_tree_twoway $treeDFDF $treeDF && git-ls-files --stage >DFDFcheck.out && diff -u DF.out DFDFcheck.out && @@ -411,7 +411,7 @@ test_expect_success \ rm -fr DF && mkdir DF && echo DF/DF >DF/DF && - git-update-cache --add DF/DF && + git-update-index --add DF/DF && # This should fail because I and H have a conflict # at DF. if git-read-tree --emu23 $treeDF $treeDFDF diff --git a/t/t2000-checkout-cache-clash.sh b/t/t2000-checkout-cache-clash.sh index a2c42602d..03ea4dece 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 diff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh index f0e3d1d8c..b1c5263a9 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,7 +73,7 @@ test_debug 'show_files $tree3' test_expect_success \ 'read previously written tree and checkout.' \ - 'git-read-tree $tree2 && git-checkout-cache -f -a' + 'git-read-tree $tree2 && git-checkout-index -f -a' test_debug show_files $tree2 test_expect_success \ diff --git a/t/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh index 69146acc3..4352ddb1c 100755 --- a/t/t2002-checkout-cache-u.sh +++ b/t/t2002-checkout-cache-u.sh @@ -3,31 +3,31 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-checkout-cache -u test. +test_description='git-checkout-index -u test. -With -u flag, git-checkout-cache internally runs the equivalent of -git-update-cache --refresh on the checked out entry.' +With -u flag, git-checkout-index internally runs the equivalent of +git-update-index --refresh on the checked out entry.' . ./test-lib.sh test_expect_success \ 'preparation' ' echo frotz >path0 && -git-update-cache --add path0 && +git-update-index --add path0 && t=$(git-write-tree)' test_expect_failure \ -'without -u, git-checkout-cache smudges stat information.' ' +'without -u, git-checkout-index smudges stat information.' ' rm -f path0 && git-read-tree $t && -git-checkout-cache -f -a && +git-checkout-index -f -a && git-diff-files | diff - /dev/null' test_expect_success \ -'with -u, git-checkout-cache picks up stat information from new files.' ' +'with -u, git-checkout-index picks up stat information from new files.' ' rm -f path0 && git-read-tree $t && -git-checkout-cache -u -f -a && +git-checkout-index -u -f -a && git-diff-files | diff - /dev/null' test_done diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh index ed5e4ee51..f9bc90aee 100755 --- a/t/t2003-checkout-cache-mkdir.sh +++ b/t/t2003-checkout-cache-mkdir.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-checkout-cache --prefix test. +test_description='git-checkout-index --prefix test. This test makes sure that --prefix option works as advertised, and also verifies that such leading path may contain symlinks, unlike @@ -17,14 +17,14 @@ test_expect_success \ 'mkdir path1 && echo frotz >path0 && echo rezrov >path1/file1 && - git-update-cache --add path0 path1/file1' + git-update-index --add path0 path1/file1' test_expect_success \ 'have symlink in place where dir is expected.' \ 'rm -fr path0 path1 && mkdir path2 && ln -s path2 path1 && - git-checkout-cache -f -a && + git-checkout-index -f -a && test ! -h path1 && test -d path1 && test -f path1/file1 && test ! -f path2/file1' @@ -32,7 +32,7 @@ test_expect_success \ 'use --prefix=path2/' \ 'rm -fr path0 path1 path2 && mkdir path2 && - git-checkout-cache --prefix=path2/ -f -a && + git-checkout-index --prefix=path2/ -f -a && test -f path2/path0 && test -f path2/path1/file1 && test ! -f path0 && @@ -41,7 +41,7 @@ test_expect_success \ test_expect_success \ 'use --prefix=tmp-' \ 'rm -fr path0 path1 path2 tmp* && - git-checkout-cache --prefix=tmp- -f -a && + git-checkout-index --prefix=tmp- -f -a && test -f tmp-path0 && test -f tmp-path1/file1 && test ! -f path0 && @@ -52,7 +52,7 @@ test_expect_success \ 'rm -fr path0 path1 path2 tmp* && echo nitfol >tmp-path1 && mkdir tmp-path0 && - git-checkout-cache --prefix=tmp- -f -a && + git-checkout-index --prefix=tmp- -f -a && test -f tmp-path0 && test -f tmp-path1/file1 && test ! -f path0 && @@ -64,7 +64,7 @@ test_expect_success \ 'rm -fr path0 path1 path2 tmp* && mkdir tmp1 tmp1/orary && ln -s tmp1 tmp && - git-checkout-cache --prefix=tmp/orary/ -f -a && + git-checkout-index --prefix=tmp/orary/ -f -a && test -d tmp1/orary && test -f tmp1/orary/path0 && test -f tmp1/orary/path1/file1 && @@ -76,7 +76,7 @@ test_expect_success \ 'rm -fr path0 path1 path2 tmp* && mkdir tmp1 && ln -s tmp1 tmp && - git-checkout-cache --prefix=tmp/orary- -f -a && + git-checkout-index --prefix=tmp/orary- -f -a && test -f tmp1/orary-path0 && test -f tmp1/orary-path1/file1 && test -h tmp' @@ -87,7 +87,7 @@ test_expect_success \ 'rm -fr path0 path1 path2 tmp* && mkdir tmp1 && ln -s tmp1 tmp-path1 && - git-checkout-cache --prefix=tmp- -f -a && + git-checkout-index --prefix=tmp- -f -a && test -f tmp-path0 && test ! -h tmp-path1 && test -d tmp-path1 && diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh index 86b7375c6..5bc0a3bed 100755 --- a/t/t2100-update-cache-badpath.sh +++ b/t/t2100-update-cache-badpath.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-update-cache nonsense-path test. +test_description='git-update-index nonsense-path test. This test creates the following structure in the cache: @@ -12,7 +12,7 @@ This test creates the following structure in the cache: path2/file2 - a file in a directory path3/file3 - a file in a directory -and tries to git-update-cache --add the following: +and tries to git-update-index --add the following: path0/file0 - a file in a directory path1/file1 - a file in a directory @@ -31,8 +31,8 @@ date >path2/file2 date >path3/file3 test_expect_success \ - 'git-update-cache --add to add various paths.' \ - 'git-update-cache --add -- path0 path1 path2/file2 path3/file3' + 'git-update-index --add to add various paths.' \ + 'git-update-index --add -- path0 path1 path2/file2 path3/file3' rm -fr path? @@ -45,7 +45,7 @@ date >path1/file1 for p in path0/file0 path1/file1 path2 path3 do test_expect_failure \ - "git-update-cache to add conflicting path $p should fail." \ - "git-update-cache --add -- $p" + "git-update-index to add conflicting path $p should fail." \ + "git-update-index --add -- $p" done test_done diff --git a/t/t3010-ls-files-killed.sh b/t/t3010-ls-files-killed.sh index c4d6d2163..2e18baae5 100755 --- a/t/t3010-ls-files-killed.sh +++ b/t/t3010-ls-files-killed.sh @@ -33,8 +33,8 @@ mkdir path2 path3 date >path2/file2 date >path3/file3 test_expect_success \ - 'git-update-cache --add to add various paths.' \ - "git-update-cache --add -- path0 path1 path?/file?" + 'git-update-index --add to add various paths.' \ + "git-update-index --add -- path0 path1 path?/file?" rm -fr path? date >path2 diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh index 61a7c7f64..c6ce56c86 100755 --- a/t/t3100-ls-tree-restrict.sh +++ b/t/t3100-ls-tree-restrict.sh @@ -27,7 +27,7 @@ test_expect_success \ ln -s ../path1 path2/bazbo && echo Mi >path2/baz/b && find path? \( -type f -o -type l \) -print | - xargs git-update-cache --add && + xargs git-update-index --add && tree=`git-write-tree` && echo $tree' diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index 3accb14f0..91015d76f 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -16,7 +16,7 @@ chmod +x path1 test_expect_success \ 'update-cache --add two files with and without +x.' \ - 'git-update-cache --add path0 path1' + 'git-update-index --add path0 path1' mv path0 path0- sed -e 's/line/Line/' <path0- >path0 diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 80edae668..be4748568 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -27,7 +27,7 @@ Line 15 test_expect_success \ 'update-cache --add a file.' \ - 'git-update-cache --add path0' + 'git-update-index --add path0' test_expect_success \ 'write that tree.' \ @@ -37,11 +37,11 @@ sed -e 's/line/Line/' <path0 >path1 rm -f path0 test_expect_success \ 'renamed and edited the file.' \ - 'git-update-cache --add --remove path0 path1' + 'git-update-index --add --remove path0 path1' test_expect_success \ - 'git-diff-cache -p -M after rename and editing.' \ - 'git-diff-cache -p -M $tree >current' + 'git-diff-index -p -M after rename and editing.' \ + 'git-diff-index -p -M $tree >current' cat >expected <<\EOF diff --git a/path0 b/path1 rename from path0 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' diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index 8e3091abb..27519704d 100755 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -13,7 +13,7 @@ test_expect_success \ 'prepare reference tree' \ 'cat ../../COPYING >COPYING && echo frotz >rezrov && - git-update-cache --add COPYING rezrov && + git-update-index --add COPYING rezrov && tree=$(git-write-tree) && echo $tree' @@ -22,14 +22,14 @@ test_expect_success \ 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && rm -f COPYING && - git-update-cache --add --remove COPYING COPYING.?' + git-update-index --add --remove COPYING COPYING.?' # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2, # both are slightly edited, and unchanged rezrov. So we say you # copy-and-edit one, and rename-and-edit the other. We do not say # anything about rezrov. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -M -p $tree >current +GIT_DIFF_OPTS=--unified=0 git-diff-index -M -p $tree >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.1 copy from COPYING @@ -62,14 +62,14 @@ test_expect_success \ test_expect_success \ 'prepare work tree again' \ 'mv COPYING.2 COPYING && - git-update-cache --add --remove COPYING COPYING.1 COPYING.2' + git-update-index --add --remove COPYING COPYING.1 COPYING.2' # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, # both are slightly edited, and unchanged rezrov. So we say you # edited one, and copy-and-edit the other. We do not say # anything about rezrov. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -C -p $tree >current +GIT_DIFF_OPTS=--unified=0 git-diff-index -C -p $tree >current cat >expected <<\EOF diff --git a/COPYING b/COPYING --- a/COPYING @@ -100,16 +100,16 @@ test_expect_success \ test_expect_success \ 'prepare work tree once again' \ 'cat ../../COPYING >COPYING && - git-update-cache --add --remove COPYING COPYING.1' + git-update-index --add --remove COPYING COPYING.1' # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, # but COPYING is not edited. We say you copy-and-edit COPYING.1; this # is only possible because -C mode now reports the unmodified file to # the diff-core. Unchanged rezrov, although being fed to -# git-diff-cache as well, should not be mentioned. +# git-diff-index as well, should not be mentioned. GIT_DIFF_OPTS=--unified=0 \ - git-diff-cache -C --find-copies-harder -p $tree >current + git-diff-index -C --find-copies-harder -p $tree >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.1 copy from COPYING diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh index 010dd87ee..f59614ae2 100755 --- a/t/t4004-diff-rename-symlink.sh +++ b/t/t4004-diff-rename-symlink.sh @@ -15,7 +15,7 @@ test_expect_success \ 'prepare reference tree' \ 'echo xyzzy | tr -d '\\\\'012 >yomin && ln -s xyzzy frotz && - git-update-cache --add frotz yomin && + git-update-index --add frotz yomin && tree=$(git-write-tree) && echo $tree' @@ -25,7 +25,7 @@ test_expect_success \ rm -f yomin && ln -s xyzzy nitfol && ln -s xzzzy bozbar && - git-update-cache --add --remove frotz rezrov nitfol bozbar yomin' + git-update-index --add --remove frotz rezrov nitfol bozbar yomin' # tree has frotz pointing at xyzzy, and yomin that contains xyzzy to # confuse things. work tree has rezrov (xyzzy) nitfol (xyzzy) and @@ -33,7 +33,7 @@ test_expect_success \ # rezrov and nitfol are rename/copy of frotz and bozbar should be # a new creation. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -M -p $tree >current +GIT_DIFF_OPTS=--unified=0 git-diff-index -M -p $tree >current cat >expected <<\EOF diff --git a/bozbar b/bozbar new file mode 120000 diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index cee06e4c5..5636f4f2c 100755 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -13,7 +13,7 @@ test_expect_success \ 'prepare reference tree' \ 'cat ../../COPYING >COPYING && echo frotz >rezrov && - git-update-cache --add COPYING rezrov && + git-update-index --add COPYING rezrov && tree=$(git-write-tree) && echo $tree' @@ -22,14 +22,14 @@ test_expect_success \ 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && rm -f COPYING && - git-update-cache --add --remove COPYING COPYING.?' + git-update-index --add --remove COPYING COPYING.?' # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2, # both are slightly edited, and unchanged rezrov. We say COPYING.1 # and COPYING.2 are based on COPYING, and do not say anything about # rezrov. -git-diff-cache -M $tree >current +git-diff-index -M $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 @@ -77,14 +77,14 @@ test_expect_success \ test_expect_success \ 'prepare work tree again' \ 'mv COPYING.2 COPYING && - git-update-cache --add --remove COPYING COPYING.1 COPYING.2' + git-update-index --add --remove COPYING COPYING.1 COPYING.2' # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, # both are slightly edited, and unchanged rezrov. We say COPYING.1 # is based on COPYING and COPYING is still there, and do not say anything # about rezrov. -git-diff-cache -C $tree >current +git-diff-index -C $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M COPYING :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 @@ -134,9 +134,9 @@ test_expect_success \ test_expect_success \ 'prepare work tree once again' \ 'cat ../../COPYING >COPYING && - git-update-cache --add --remove COPYING COPYING.1' + git-update-index --add --remove COPYING COPYING.1' -git-diff-cache -C --find-copies-harder $tree >current +git-diff-index -C --find-copies-harder $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 EOF diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index 90fd21ff1..e2a67e963 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -11,15 +11,15 @@ test_description='Test mode change diffs. test_expect_success \ 'setup' \ 'echo frotz >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && tree=`git-write-tree` && echo $tree' test_expect_success \ 'chmod' \ 'chmod +x rezrov && - git-update-cache rezrov && - git-diff-cache $tree >current' + git-update-index rezrov && + git-diff-index $tree >current' _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh index 042390aa8..bb6ba6925 100755 --- a/t/t4007-rename-3.sh +++ b/t/t4007-rename-3.sh @@ -13,20 +13,20 @@ test_expect_success \ 'prepare reference tree' \ 'mkdir path0 path1 && cp ../../COPYING path0/COPYING && - git-update-cache --add path0/COPYING && + git-update-index --add path0/COPYING && tree=$(git-write-tree) && echo $tree' test_expect_success \ 'prepare work tree' \ 'cp path0/COPYING path1/COPYING && - git-update-cache --add --remove path0/COPYING path1/COPYING' + git-update-index --add --remove path0/COPYING path1/COPYING' # In the tree, there is only path0/COPYING. In the cache, path0 and # path1 both have COPYING and the latter is a copy of path0/COPYING. # Comparing the full tree with cache should tell us so. -git-diff-cache -C --find-copies-harder $tree >current +git-diff-index -C --find-copies-harder $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING @@ -42,7 +42,7 @@ test_expect_success \ # path1/COPYING suddenly appearing from nowhere, not detected as # a copy from path0/COPYING. -git-diff-cache -C $tree path1 >current +git-diff-index -C $tree path1 >current cat >expected <<\EOF :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING @@ -55,14 +55,14 @@ test_expect_success \ test_expect_success \ 'tweak work tree' \ 'rm -f path0/COPYING && - git-update-cache --remove path0/COPYING' + git-update-index --remove path0/COPYING' # In the tree, there is only path0/COPYING. In the cache, path0 does # not have COPYING anymore and path1 has COPYING which is a copy of # path0/COPYING. Showing the full tree with cache should tell us about # the rename. -git-diff-cache -C $tree >current +git-diff-index -C $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING @@ -77,7 +77,7 @@ test_expect_success \ # path0/COPYING. When we say we care only about path1, we should just # see path1/COPYING appearing from nowhere. -git-diff-cache -C $tree path1 >current +git-diff-index -C $tree path1 >current cat >expected <<\EOF :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh index 4c971c9f0..263ac1ebf 100755 --- a/t/t4008-diff-break-rewrite.sh +++ b/t/t4008-diff-break-rewrite.sh @@ -28,7 +28,7 @@ test_expect_success \ setup \ 'cat ../../README >file0 && cat ../../COPYING >file1 && - git-update-cache --add file0 file1 && + git-update-index --add file0 file1 && tree=$(git-write-tree) && echo "$tree"' @@ -36,11 +36,11 @@ test_expect_success \ 'change file1 with copy-edit of file0 and remove file0' \ 'sed -e "s/git/GIT/" file0 >file1 && rm -f file0 && - git-update-cache --remove file0 file1' + git-update-index --remove file0 file1' test_expect_success \ 'run diff with -B' \ - 'git-diff-cache -B --cached "$tree" >current' + 'git-diff-index -B --cached "$tree" >current' cat >expected <<\EOF :100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0 @@ -53,7 +53,7 @@ test_expect_success \ test_expect_success \ 'run diff with -B and -M' \ - 'git-diff-cache -B -M "$tree" >current' + 'git-diff-index -B -M "$tree" >current' cat >expected <<\EOF :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1 @@ -67,15 +67,15 @@ test_expect_success \ 'swap file0 and file1' \ 'rm -f file0 file1 && git-read-tree -m $tree && - git-checkout-cache -f -u -a && + git-checkout-index -f -u -a && mv file0 tmp && mv file1 file0 && mv tmp file1 && - git-update-cache file0 file1' + git-update-index file0 file1' test_expect_success \ 'run diff with -B' \ - 'git-diff-cache -B "$tree" >current' + 'git-diff-index -B "$tree" >current' cat >expected <<\EOF :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0 @@ -88,7 +88,7 @@ test_expect_success \ test_expect_success \ 'run diff with -B and -M' \ - 'git-diff-cache -B -M "$tree" >current' + 'git-diff-index -B -M "$tree" >current' cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0 @@ -103,11 +103,11 @@ test_expect_success \ 'make file0 into something completely different' \ 'rm -f file0 && ln -s frotz file0 && - git-update-cache file0 file1' + git-update-index file0 file1' test_expect_success \ 'run diff with -B' \ - 'git-diff-cache -B "$tree" >current' + 'git-diff-index -B "$tree" >current' cat >expected <<\EOF :100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0 @@ -120,7 +120,7 @@ test_expect_success \ test_expect_success \ 'run diff with -B' \ - 'git-diff-cache -B -M "$tree" >current' + 'git-diff-index -B -M "$tree" >current' # This should not mistake file0 as the copy source of new file1 # due to type differences. @@ -135,7 +135,7 @@ test_expect_success \ test_expect_success \ 'run diff with -M' \ - 'git-diff-cache -M "$tree" >current' + 'git-diff-index -M "$tree" >current' # This should not mistake file0 as the copy source of new file1 # due to type differences. @@ -152,15 +152,15 @@ test_expect_success \ 'file1 edited to look like file0 and file0 rename-edited to file2' \ 'rm -f file0 file1 && git-read-tree -m $tree && - git-checkout-cache -f -u -a && + git-checkout-index -f -u -a && sed -e "s/git/GIT/" file0 >file1 && sed -e "s/git/GET/" file0 >file2 && rm -f file0 - git-update-cache --add --remove file0 file1 file2' + git-update-index --add --remove file0 file1 file2' test_expect_success \ 'run diff with -B' \ - 'git-diff-cache -B "$tree" >current' + 'git-diff-index -B "$tree" >current' cat >expected <<\EOF :100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0 @@ -174,7 +174,7 @@ test_expect_success \ test_expect_success \ 'run diff with -B -M' \ - 'git-diff-cache -B -M "$tree" >current' + 'git-diff-index -B -M "$tree" >current' cat >expected <<\EOF :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1 diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh index 6229a5bf1..ea811529c 100755 --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -13,7 +13,7 @@ test_expect_success \ 'prepare reference tree' \ 'cat ../../COPYING >COPYING && echo frotz >rezrov && - git-update-cache --add COPYING rezrov && + git-update-index --add COPYING rezrov && tree=$(git-write-tree) && echo $tree' @@ -22,14 +22,14 @@ test_expect_success \ 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && rm -f COPYING && - git-update-cache --add --remove COPYING COPYING.?' + git-update-index --add --remove COPYING COPYING.?' # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2, # both are slightly edited, and unchanged rezrov. We say COPYING.1 # and COPYING.2 are based on COPYING, and do not say anything about # rezrov. -git-diff-cache -z -M $tree >current +git-diff-index -z -M $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 @@ -81,14 +81,14 @@ test_expect_success \ test_expect_success \ 'prepare work tree again' \ 'mv COPYING.2 COPYING && - git-update-cache --add --remove COPYING COPYING.1 COPYING.2' + git-update-index --add --remove COPYING COPYING.1 COPYING.2' # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, # both are slightly edited, and unchanged rezrov. We say COPYING.1 # is based on COPYING and COPYING is still there, and do not say anything # about rezrov. -git-diff-cache -z -C $tree >current +git-diff-index -z -C $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M COPYING @@ -141,9 +141,9 @@ test_expect_success \ test_expect_success \ 'prepare work tree once again' \ 'cat ../../COPYING >COPYING && - git-update-cache --add --remove COPYING COPYING.1' + git-update-index --add --remove COPYING COPYING.1' -git-diff-cache -z -C --find-copies-harder $tree >current +git-diff-index -z -C --find-copies-harder $tree >current cat >expected <<\EOF :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index 9f2c6f6aa..8db329d7f 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -17,18 +17,18 @@ test_expect_success \ 'echo frotz >file0 && mkdir path1 && echo rezrov >path1/file1 && - git-update-cache --add file0 path1/file1 && + git-update-index --add file0 path1/file1 && tree=`git-write-tree` && echo "$tree" && echo nitfol >file0 && echo yomin >path1/file1 && - git-update-cache file0 path1/file1' + git-update-index file0 path1/file1' cat >expected <<\EOF EOF test_expect_success \ 'limit to path should show nothing' \ - 'git-diff-cache --cached $tree path >current && + 'git-diff-index --cached $tree path >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -36,7 +36,7 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to path1 should show path1/file1' \ - 'git-diff-cache --cached $tree path1 >current && + 'git-diff-index --cached $tree path1 >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -44,7 +44,7 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to path1/ should show path1/file1' \ - 'git-diff-cache --cached $tree path1/ >current && + 'git-diff-index --cached $tree path1/ >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -52,14 +52,14 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to file0 should show file0' \ - 'git-diff-cache --cached $tree file0 >current && + 'git-diff-index --cached $tree file0 >current && compare_diff_raw current expected' cat >expected <<\EOF EOF test_expect_success \ 'limit to file0/ should emit nothing.' \ - 'git-diff-cache --cached $tree file0/ >current && + 'git-diff-index --cached $tree file0/ >current && compare_diff_raw current expected' test_done diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index f591a5681..530cc4d2a 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -26,7 +26,7 @@ echo 'This is foo' >foo chmod +x foo test_expect_success setup \ - 'git-update-cache --add foo' + 'git-update-index --add foo' test_expect_success apply \ 'git-apply --index --stat --summary --apply test-patch' diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh index 906188cdf..a06f6956d 100755 --- a/t/t4112-apply-renames.sh +++ b/t/t4112-apply-renames.sh @@ -139,7 +139,7 @@ rename to include/arch/m32r/klibc/archsetjmp.h +#endif /* _KLIBC_ARCHSETJMP_H */ EOF -find include klibc -type f -print | xargs git-update-cache --add -- +find include klibc -type f -print | xargs git-update-index --add -- test_expect_success 'check rename/copy patch' 'git-apply --check patch' diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index abce66921..6bf34066e 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -37,8 +37,8 @@ test_expect_success \ test_expect_success \ 'add files to repository' \ - 'find a -type f | xargs git-update-cache --add && - find a -type l | xargs git-update-cache --add && + 'find a -type f | xargs git-update-index --add && + find a -type l | xargs git-update-index --add && treeid=`git-write-tree` && echo $treeid >treeid && TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 03951242d..bb62336f2 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -16,9 +16,9 @@ test_expect_success \ for i in a b c do dd if=/dev/zero bs=4k count=1 | tr "\\0" $i >$i && - git-update-cache --add $i || return 1 + git-update-index --add $i || return 1 done && - cat c >d && echo foo >>d && git-update-cache --add d && + cat c >d && echo foo >>d && git-update-index --add d && tree=`git-write-tree` && commit=`git-commit-tree $tree </dev/null` && { echo $tree && diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 2c142dfeb..fb8320d75 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -21,9 +21,9 @@ test_expect_success setup ' parent=$commit || return 1 done && echo "$commit" >.git/HEAD && - git clone -l ./. victim && + git-clone.sh -l ./. victim && cd victim && - git log && + git-log.sh && cd .. && echo $zero >.git/HEAD && parent=$zero && @@ -35,7 +35,7 @@ test_expect_success setup ' done && echo "$commit" >.git/HEAD && echo Rebase && - git log' + git-log.sh' test_expect_success \ 'pushing rewound head should not barf but require --force' ' diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 7fe744e83..010124238 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -45,7 +45,7 @@ grep_stderr() } date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index 99d86ae5a..d0a4ff29c 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -40,7 +40,7 @@ test_bisection_diff() } date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh index eb41f86a1..88d14ee1a 100755 --- a/t/t6003-rev-list-topo-order.sh +++ b/t/t6003-rev-list-topo-order.sh @@ -14,7 +14,7 @@ list_duplicates() } date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index 4f57a28f6..1beab7197 100644 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -9,7 +9,7 @@ test_description='Test git-rev-parse with different parent options' . ../t6000lib.sh # t6xxx specific functions date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree hide_error save_tag start unique_commit "start" tree save_tag second unique_commit "second" tree -p start |