diff options
Diffstat (limited to 't/lib-read-tree-m-3way.sh')
| -rwxr-xr-x | t/lib-read-tree-m-3way.sh | 44 |
1 files changed, 22 insertions, 22 deletions
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' |