git-add --intent-to-add (-N)

[git.git] / t / t7001-mv.sh

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index b0fa407825b4b8d0df264c0127bb20093415a3ed..78167980b31caa7d0da5e46337d6738ae473b940 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -6,7 +6,7 @@ test_description='git mv in subdirs'
 test_expect_success \
     'prepare reference tree' \
     'mkdir path0 path1 &&
-     cp ../../COPYING path0/COPYING &&
+     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
      git add path0/COPYING &&
      git-commit -m add -a'
 
@@ -40,7 +40,7 @@ test_expect_success \
 
 test_expect_success \
     'adding another file' \
-    'cp ../../README path0/README &&
+    'cp "$TEST_DIRECTORY"/../README path0/README &&
      git add path0/README &&
      git-commit -m add2 -a'
 
@@ -185,6 +185,7 @@ test_expect_success 'git mv should overwrite symlink to a file' '
        ! test -e moved &&
        test -f symlink &&
        test "$(cat symlink)" = 1 &&
+       git update-index --refresh &&
        git diff-files --quiet
 
 '
@@ -202,6 +203,7 @@ test_expect_success 'git mv should overwrite file with a symlink' '
        git mv -f symlink moved &&
        ! test -e symlink &&
        test -h moved &&
+       git update-index --refresh &&
        git diff-files --quiet
 
 '