X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7001-mv.sh;h=a845b154e4db50b52eb67eaefefcc42403c52c0e;hb=19a6cd372a998df3079d870e02c064c5bb101841;hp=65a35d94a001b555ce9e4d6c528d588339a5300b;hpb=03f94ae9f909952ed5a78917ab319a312889354b;p=git.git diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 65a35d94a..a845b154e 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -61,7 +61,7 @@ test_expect_success \ test_expect_success \ 'checking -f on untracked file with existing target' \ 'touch path0/untracked1 && - git mv -f untracked1 path0 + test_must_fail git mv -f untracked1 path0 && test ! -f .git/index.lock && test -f untracked1 && test -f path0/untracked1' @@ -207,7 +207,7 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' ' git init && echo 1 >dirty && git add dirty && - entry="$(git ls-files --stage dirty | cut -f 1)" + entry="$(git ls-files --stage dirty | cut -f 1)" && git mv dirty dirty2 && [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] && echo 2 >dirty2 &&