revision --simplify-merges: use decoration instead of commit->util field

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index b0fa407825b4b8d0df264c0127bb20093415a3ed..910a28c7e29b6dd8bd30d1ccb156681b44e51bca 100755 (executable)
--- 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
 
 '