X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4004-diff-rename-symlink.sh;h=f59614ae255b33f450a784200716c9fd63b0a054;hb=144c83f687e9c3020497662dfae47d03005a9e21;hp=010dd87eef4ac0c2f2b3b5549bbb7147d4666fa4;hpb=80bd6f3064a6009cd18a4dab9ce6d29681cec4af;p=git.git diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh index 010dd87e..f59614ae 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