From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jul 2008 05:27:39 +0000 (-0700)
Subject: t7001: fix "git mv" test
X-Git-Tag: v1.6.0-rc2~61
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65c35b2256ecbfaebcf04559fe6070807646afff;p=git.git

t7001: fix "git mv" test

The test assumed that we can keep the cached stat information fresh across
rename(2); many filesystems however update st_ctime (and POSIX allows them
to do so), and that assumption does not hold.

We can explicitly refresh the index for the purpose of these tests.  The
only thing we are interested in is the staged contents and the mode bits
are preserved across "git mv".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index b0fa40782..910a28c7e 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -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
 
 '